hqchart 1.1.14161 → 1.1.14172

package/src/jscommon/umychart.js

@@ -3039,9 +3039,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     { 
         IsValueFullRange:false , 
         IsDisplayLatest:false, 
-        SelectedBorder:{ Mode:0, SelFrame:0 },                      //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
-        SelectedXBorder: { Mode:0, Date:null }          //X边框选中模式 Mode:0=禁用 分时图图有效
+        SelectedBorder:{ Mode:0, SelFrame:0 },          //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
+        SelectedXBorder: { Mode:0, Date:null },         //X边框选中模式 Mode:0=禁用 分时图图有效
          //XDateFormat (多日分时图x轴底部日期格式)
+        RightHorizontal:
+        { 
+            //Show:true, 
+            //Width:5 
+        }          //右侧框架外部坐标和间距
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -11831,6 +11836,23 @@ function AverageWidthFrame()
         }
     }
 
+    this.IsShowRightHorizontal=function()
+    {
+        var borderRight=this.ChartBorder.Right;
+        if (borderRight<=10) return false;
+
+        if (this.YTextPosition[1]==2) return false;
+        if (this.IsShowYText[1]===false) return false;
+
+        if (this.GlobalOption && this.GlobalOption.RightHorizontal)
+        {
+            var item=this.GlobalOption.RightHorizontal;
+            if (item.Show===false) return false;
+        }
+
+        return true;
+    }
+
     //画Y轴
     this.DrawHorizontal=function()
     {
@@ -11847,7 +11869,8 @@ function AverageWidthFrame()
         var borderLeft=this.ChartBorder.Left;
 
         var isDrawLeft=borderLeft>10 && this.IsShowYText[0]===true && this.YTextPosition[0]!=2;
-        var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+        //var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+        var isDrawRight=this.IsShowRightHorizontal();
 
         var rightExtendLine=null;   //右侧延长线
         var leftExtendLine=null;    //左侧延长线
@@ -13846,7 +13869,8 @@ function AverageWidthFrame()
             var borderRight=this.ChartBorder.Right;
             var borderLeft=this.ChartBorder.Left;
             var isDrawLeft=borderLeft>10 && this.IsShowYText[0]===true && this.YTextPosition[0]!=2;
-            var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+            //var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+            isDrawRight=this.IsShowRightHorizontal();
         }
        
         if (!isDrawRight && !isDrawLeft) return null;
@@ -43744,7 +43768,7 @@ function StockInfoExtendChartPaint()
             this.Canvas.textAlign="left";
             this.Canvas.fillText(this.Name,middle+2,y);
         }
-        ;
+        
         this.Canvas.strokeStyle=this.BorderColor;
         this.Canvas.moveTo(left,y);
         this.Canvas.lineTo(right,y);
@@ -44525,6 +44549,133 @@ function StockChip()
     }
 }
 
+//筹码分布手机版
+function StockChipPhone()
+{
+    this.newMethod=StockChip;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.Name='筹码分布手机版';
+    this.ClassName='StockChipPhone';
+    this.ShowType=0;    //0=所有筹码  手机版只支持0
+
+    this.Draw=function()
+    {
+        this.ShowType=0;
+        this.PixelRatio=GetDevicePixelRatio();
+        var left=ToFixedPoint(this.ChartBorder.GetRight()+this.Left);
+        var top=ToFixedPoint(this.ChartBorder.GetTop());
+        var right=ToFixedPoint(left+this.Width-1*this.PixelRatio);
+        var bottom=ToFixedPoint(this.ChartBorder.GetBottom());
+        var width=right-left;
+        var height=bottom-top;
+        this.ClientRect={Left:left,Top:top,Width:width,Height:height};
+
+        if (ChartData.IsTickPeriod(this.HQChart.Period))
+        {
+
+        }
+        else
+        {
+            if (this.CalculateChip())
+            {
+                this.DrawFrame();
+                this.DrawAllChip();
+        
+                this.CalculateCast();   //计算成本  
+                this.DrawChipInfo();      
+            }
+        }
+
+        this.DrawBorder();
+        this.SizeChange=false;
+    }
+
+    this.DrawToolbar=function(moveonPoint, mouseStatus)
+    {
+
+    }
+
+    this.GetChipInfoTitle=function()
+    {
+        var aryText=[]; //从底部往上
+
+        var item={ Title:"日期:", Text:IFrameSplitOperator.FormatDateString(this.Data.SelectData.Date) };
+        aryText.push(item);
+
+        var item={ Title:"集中度:", Text:"--.--%", };
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast)) item.Text=`${this.Data.Cast[0].Rate.toFixed(2)}%`;
+        aryText.push(item);
+
+        var item={ Title:"90%成本:", Text:"--.--", };
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast)) item.Text=`${this.Data.Cast[0].MinPrice.toFixed(2)}-${this.Data.Cast[0].MaxPrice.toFixed(2)}`;
+        aryText.push(item);
+
+
+        var item={ Title:"平均成本：:", Text:"--.--",  };
+        if (this.Data.ChipInfo && IFrameSplitOperator.IsNumber(this.Data.ChipInfo.AveragePrice)) item.Text=`${this.Data.ChipInfo.AveragePrice.toFixed(2)}`;
+
+        if (IFrameSplitOperator.IsNumber(this.Data.YPrice) && IFrameSplitOperator.IsNumber(this.Data.ChipInfo.YProfitRate))
+        {
+            var item={ Title:`${this.Data.YPrice.toFixed(2)}获利:`, Text:`${this.Data.ChipInfo.YProfitRate.toFixed(2)}%` };
+            aryText.push(item);
+        }
+
+        return aryText;
+    }
+
+    this.DrawChipInfo=function()    
+    {
+        var aryText=this.GetChipInfoTitle();
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryText)) return;
+
+        var bottom=this.ClientRect.Top+this.ClientRect.Height-1;
+        var left=this.ClientRect.Left+2;
+        var right=this.ClientRect.Left+this.ClientRect.Width;
+
+        this.Canvas.font=this.Font;
+        this.Canvas.fillStyle=this.InfoColor;
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.textAlign='left';
+
+        var lineHeight=this.LineHeight*GetDevicePixelRatio();
+        var yText=bottom;
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+
+            var textColor=item.TitleColor;
+            if (item.TitleColor) textColor=item.TitleColor;
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(item.Title,left,yText);
+            var textWidth=this.Canvas.measureText(item.Title).width+4;
+            var xText=left+textWidth;
+
+            var textColor=item.TitleColor;
+            if (item.TextColor) textColor=item.TextColor;
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(item.Text,xText,yText);
+
+            yText-=lineHeight;
+        }
+        
+        var text='获利比例：';
+        this.Canvas.fillText(text,left,yText);
+        var textWidth=this.Canvas.measureText(text).width+2;
+        var barLeft=left+textWidth;
+        var barWidth=(right-5-barLeft);
+        this.Canvas.strokeStyle=this.ColorNoProfit;
+        this.Canvas.strokeRect(barLeft,yText-lineHeight,barWidth,lineHeight);
+        this.Canvas.strokeStyle=this.ColorProfit;
+        this.Canvas.strokeRect(barLeft,yText-lineHeight,barWidth*(this.Data.ChipInfo.ProfitRate/100),lineHeight);
+        text=this.Data.ChipInfo.ProfitRate.toFixed(2)+'%';
+        this.Canvas.textAlign='center';
+        this.Canvas.fillText(text,barLeft+barWidth/2,yText);
+        yText-=lineHeight;
+    }
+}
+
 //窗口分割
 function FrameSplitPaint()
 {
@@ -77061,6 +77212,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         switch(name)
         {
             case '筹码分布':
+            case "StockChip":
                 chart=new StockChip();
                 chart.Canvas=this.Canvas;
                 chart.ChartBorder=this.Frame.ChartBorder;
@@ -77071,6 +77223,18 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.ExtendChartPaint.push(chart);
                 this.Frame.ChartBorder.Right+=chart.Width;  //创建筹码需要增加右边的间距
                 return chart;
+            case "StockChipPhone":
+                chart=new StockChipPhone();
+                chart.Canvas=this.Canvas;
+                chart.ChartBorder=this.Frame.ChartBorder;
+                chart.ChartFrame=this.Frame;
+                chart.HQChart=this;
+                chart.Left=this.Frame.ChartBorder.Right;    //左边间距使用当前框架间距
+                chart.SetOption(option);
+                this.ExtendChartPaint.push(chart);
+                this.Frame.ChartBorder.Right+=chart.Width;  //创建筹码需要增加右边的间距
+                this.GlobalOption.RightHorizontal.Show=false;
+                return chart;
             case 'KLineTooltip':
                 if (option.Create && typeof(option.Create)=='function') chart=option.Create();
                 else chart=new KLineTooltipPaint();

package/src/jscommon/umychart.report.js

@@ -1975,6 +1975,8 @@ function JSReportChartContainer(uielement)
     //去掉右键菜单
     this.UIOnContextMenu=function(e)
     {
+        e.preventDefault();
+        
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
         if (!this.IsShowRightMenu) return;
@@ -1987,7 +1989,7 @@ function JSReportChartContainer(uielement)
 
     this.OnRightMenu=function(x,y,e)
     {
-        e.preventDefault();
+       
     }
 
     this.UIOnMouseMove=function(e)

package/src/jscommon/umychart.resource/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1040563 */
-  src: url('iconfont.woff2?t=1721033595459') format('woff2'),
-       url('iconfont.woff?t=1721033595459') format('woff'),
-       url('iconfont.ttf?t=1721033595459') format('truetype');
+  src: url('iconfont.woff2?t=1732508423204') format('woff2'),
+       url('iconfont.woff?t=1732508423204') format('woff'),
+       url('iconfont.ttf?t=1732508423204') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-chicangzuheicon:before {
+  content: "\e6b6";
+}
+
+.icon-sort:before {
+  content: "\e6b5";
+}
+
 .icon-Unchecked-box:before {
   content: "\e6b4";
 }

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

@@ -6964,9 +6964,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     { 
         IsValueFullRange:false , 
         IsDisplayLatest:false, 
-        SelectedBorder:{ Mode:0, SelFrame:0 },                      //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
-        SelectedXBorder: { Mode:0, Date:null }          //X边框选中模式 Mode:0=禁用 分时图图有效
+        SelectedBorder:{ Mode:0, SelFrame:0 },          //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
+        SelectedXBorder: { Mode:0, Date:null },         //X边框选中模式 Mode:0=禁用 分时图图有效
          //XDateFormat (多日分时图x轴底部日期格式)
+        RightHorizontal:
+        { 
+            //Show:true, 
+            //Width:5 
+        }          //右侧框架外部坐标和间距
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -15756,6 +15761,23 @@ function AverageWidthFrame()
         }
     }
 
+    this.IsShowRightHorizontal=function()
+    {
+        var borderRight=this.ChartBorder.Right;
+        if (borderRight<=10) return false;
+
+        if (this.YTextPosition[1]==2) return false;
+        if (this.IsShowYText[1]===false) return false;
+
+        if (this.GlobalOption && this.GlobalOption.RightHorizontal)
+        {
+            var item=this.GlobalOption.RightHorizontal;
+            if (item.Show===false) return false;
+        }
+
+        return true;
+    }
+
     //画Y轴
     this.DrawHorizontal=function()
     {
@@ -15772,7 +15794,8 @@ function AverageWidthFrame()
         var borderLeft=this.ChartBorder.Left;
 
         var isDrawLeft=borderLeft>10 && this.IsShowYText[0]===true && this.YTextPosition[0]!=2;
-        var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+        //var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+        var isDrawRight=this.IsShowRightHorizontal();
 
         var rightExtendLine=null;   //右侧延长线
         var leftExtendLine=null;    //左侧延长线
@@ -17771,7 +17794,8 @@ function AverageWidthFrame()
             var borderRight=this.ChartBorder.Right;
             var borderLeft=this.ChartBorder.Left;
             var isDrawLeft=borderLeft>10 && this.IsShowYText[0]===true && this.YTextPosition[0]!=2;
-            var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+            //var isDrawRight=borderRight>10 && this.IsShowYText[1]===true && this.YTextPosition[1]!=2;
+            isDrawRight=this.IsShowRightHorizontal();
         }
        
         if (!isDrawRight && !isDrawLeft) return null;
@@ -47669,7 +47693,7 @@ function StockInfoExtendChartPaint()
             this.Canvas.textAlign="left";
             this.Canvas.fillText(this.Name,middle+2,y);
         }
-        ;
+        
         this.Canvas.strokeStyle=this.BorderColor;
         this.Canvas.moveTo(left,y);
         this.Canvas.lineTo(right,y);
@@ -48450,6 +48474,133 @@ function StockChip()
     }
 }
 
+//筹码分布手机版
+function StockChipPhone()
+{
+    this.newMethod=StockChip;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.Name='筹码分布手机版';
+    this.ClassName='StockChipPhone';
+    this.ShowType=0;    //0=所有筹码  手机版只支持0
+
+    this.Draw=function()
+    {
+        this.ShowType=0;
+        this.PixelRatio=GetDevicePixelRatio();
+        var left=ToFixedPoint(this.ChartBorder.GetRight()+this.Left);
+        var top=ToFixedPoint(this.ChartBorder.GetTop());
+        var right=ToFixedPoint(left+this.Width-1*this.PixelRatio);
+        var bottom=ToFixedPoint(this.ChartBorder.GetBottom());
+        var width=right-left;
+        var height=bottom-top;
+        this.ClientRect={Left:left,Top:top,Width:width,Height:height};
+
+        if (ChartData.IsTickPeriod(this.HQChart.Period))
+        {
+
+        }
+        else
+        {
+            if (this.CalculateChip())
+            {
+                this.DrawFrame();
+                this.DrawAllChip();
+        
+                this.CalculateCast();   //计算成本  
+                this.DrawChipInfo();      
+            }
+        }
+
+        this.DrawBorder();
+        this.SizeChange=false;
+    }
+
+    this.DrawToolbar=function(moveonPoint, mouseStatus)
+    {
+
+    }
+
+    this.GetChipInfoTitle=function()
+    {
+        var aryText=[]; //从底部往上
+
+        var item={ Title:"日期:", Text:IFrameSplitOperator.FormatDateString(this.Data.SelectData.Date) };
+        aryText.push(item);
+
+        var item={ Title:"集中度:", Text:"--.--%", };
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast)) item.Text=`${this.Data.Cast[0].Rate.toFixed(2)}%`;
+        aryText.push(item);
+
+        var item={ Title:"90%成本:", Text:"--.--", };
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Cast)) item.Text=`${this.Data.Cast[0].MinPrice.toFixed(2)}-${this.Data.Cast[0].MaxPrice.toFixed(2)}`;
+        aryText.push(item);
+
+
+        var item={ Title:"平均成本：:", Text:"--.--",  };
+        if (this.Data.ChipInfo && IFrameSplitOperator.IsNumber(this.Data.ChipInfo.AveragePrice)) item.Text=`${this.Data.ChipInfo.AveragePrice.toFixed(2)}`;
+
+        if (IFrameSplitOperator.IsNumber(this.Data.YPrice) && IFrameSplitOperator.IsNumber(this.Data.ChipInfo.YProfitRate))
+        {
+            var item={ Title:`${this.Data.YPrice.toFixed(2)}获利:`, Text:`${this.Data.ChipInfo.YProfitRate.toFixed(2)}%` };
+            aryText.push(item);
+        }
+
+        return aryText;
+    }
+
+    this.DrawChipInfo=function()    
+    {
+        var aryText=this.GetChipInfoTitle();
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryText)) return;
+
+        var bottom=this.ClientRect.Top+this.ClientRect.Height-1;
+        var left=this.ClientRect.Left+2;
+        var right=this.ClientRect.Left+this.ClientRect.Width;
+
+        this.Canvas.font=this.Font;
+        this.Canvas.fillStyle=this.InfoColor;
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.textAlign='left';
+
+        var lineHeight=this.LineHeight*GetDevicePixelRatio();
+        var yText=bottom;
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+
+            var textColor=item.TitleColor;
+            if (item.TitleColor) textColor=item.TitleColor;
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(item.Title,left,yText);
+            var textWidth=this.Canvas.measureText(item.Title).width+4;
+            var xText=left+textWidth;
+
+            var textColor=item.TitleColor;
+            if (item.TextColor) textColor=item.TextColor;
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(item.Text,xText,yText);
+
+            yText-=lineHeight;
+        }
+        
+        var text='获利比例：';
+        this.Canvas.fillText(text,left,yText);
+        var textWidth=this.Canvas.measureText(text).width+2;
+        var barLeft=left+textWidth;
+        var barWidth=(right-5-barLeft);
+        this.Canvas.strokeStyle=this.ColorNoProfit;
+        this.Canvas.strokeRect(barLeft,yText-lineHeight,barWidth,lineHeight);
+        this.Canvas.strokeStyle=this.ColorProfit;
+        this.Canvas.strokeRect(barLeft,yText-lineHeight,barWidth*(this.Data.ChipInfo.ProfitRate/100),lineHeight);
+        text=this.Data.ChipInfo.ProfitRate.toFixed(2)+'%';
+        this.Canvas.textAlign='center';
+        this.Canvas.fillText(text,barLeft+barWidth/2,yText);
+        yText-=lineHeight;
+    }
+}
+
 //窗口分割
 function FrameSplitPaint()
 {
@@ -80986,6 +81137,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         switch(name)
         {
             case '筹码分布':
+            case "StockChip":
                 chart=new StockChip();
                 chart.Canvas=this.Canvas;
                 chart.ChartBorder=this.Frame.ChartBorder;
@@ -80996,6 +81148,18 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.ExtendChartPaint.push(chart);
                 this.Frame.ChartBorder.Right+=chart.Width;  //创建筹码需要增加右边的间距
                 return chart;
+            case "StockChipPhone":
+                chart=new StockChipPhone();
+                chart.Canvas=this.Canvas;
+                chart.ChartBorder=this.Frame.ChartBorder;
+                chart.ChartFrame=this.Frame;
+                chart.HQChart=this;
+                chart.Left=this.Frame.ChartBorder.Right;    //左边间距使用当前框架间距
+                chart.SetOption(option);
+                this.ExtendChartPaint.push(chart);
+                this.Frame.ChartBorder.Right+=chart.Width;  //创建筹码需要增加右边的间距
+                this.GlobalOption.RightHorizontal.Show=false;
+                return chart;
             case 'KLineTooltip':
                 if (option.Create && typeof(option.Create)=='function') chart=option.Create();
                 else chart=new KLineTooltipPaint();
@@ -129082,6 +129246,8 @@ function JSReportChartContainer(uielement)
     //去掉右键菜单
     this.UIOnContextMenu=function(e)
     {
+        e.preventDefault();
+        
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
         if (!this.IsShowRightMenu) return;
@@ -129094,7 +129260,7 @@ function JSReportChartContainer(uielement)
 
     this.OnRightMenu=function(x,y,e)
     {
-        e.preventDefault();
+       
     }
 
     this.UIOnMouseMove=function(e)
@@ -139529,7 +139695,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14160";
+var HQCHART_VERSION="1.1.14171";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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