hqchart 1.1.14295 → 1.1.14299

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

@@ -35730,6 +35730,127 @@ function ChartSimpleTable()
     }
 }
 
+
+//饼图
+function ChartPie()
+{   
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.Radius = 100;  //半径默认值
+    this.Width=40;
+    this.Height=50;
+
+    //this.Distance = 30; //指示线超出圆饼的距离
+    //this.txtLine = 20;  // 文本下划线
+    //this.paddingX = 20 / 3;// 设置文本的移动
+
+    
+
+    this.RectClient={ };
+    
+    this.Draw=function()
+    {
+        if (!this.Data || !this.Data.Data || !(this.Data.Data.length>0)) return this.DrawEmptyData();
+
+
+
+        let left=this.ChartBorder.GetLeft();
+        let right=this.ChartBorder.GetRight();
+        let top=this.ChartBorder.GetTop();
+        let bottom=this.ChartBorder.GetBottom();
+        let width=this.ChartBorder.GetWidth();
+        let height=this.ChartBorder.GetHeight();
+
+        if(isNaN(this.Radius)){
+            let str = this.Radius.replace("%","");
+            str = str/100;
+            if(width >= height){
+                this.Radius = str*height;
+            }
+            if(width < height) this.Radius = str*width;
+        }
+
+
+        this.Canvas.save();
+        this.Canvas.translate(width/2,height/2);
+
+        let totalValue=0;   //求和
+        for(let i in this.Data.Data)
+        {
+            totalValue += this.Data.Data[i].Value;
+        }
+        let start = 0;
+        let end = 0;
+        //画饼图
+        for(let i in this.Data.Data)
+        {
+            let item =this.Data.Data[i];
+            let rate=(item.Value/totalValue).toFixed(2); //占比
+            //JSConsole.Chart.Log('[ChartPie::Draw]', i, rate, item);
+
+            // 绘制扇形
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(0,0);
+
+            end += rate*2*Math.PI;//终止角度
+            this.Canvas.strokeStyle = "white";
+            this.Canvas.fillStyle = item.Color;
+            this.Canvas.arc(0,0,this.Radius,start,end);
+            this.Canvas.fill();
+            this.Canvas.closePath();
+            this.Canvas.stroke();
+            
+            // 绘制直线
+            this.Canvas.beginPath();
+            this.Canvas.strokeStyle = item.Color;
+            this.Canvas.moveTo(0,0);
+            let x = (this.Radius + this.Distance)*Math.cos(end- (end-start)/2);
+            let y = (this.Radius + this.Distance)*Math.sin(end - (end-start)/2);
+            this.Canvas.lineTo(x,y);
+            // JSConsole.Chart.Log(x,y,"xy")
+            
+            // 绘制横线
+            let txtLine = this.txtLine;
+            let paddingX = this.paddingX;
+            this.Canvas.textAlign = 'left';
+            if( end - (end-start)/2 < 1.5*Math.PI && end - (end-start)/2 > 0.5*Math.PI ){
+                
+                txtLine = - this.txtLine;
+                paddingX = - this.paddingX;
+                this.Canvas.textAlign = 'right';
+            }
+            this.Canvas.lineTo( x + txtLine, y );
+            this.Canvas.stroke();
+
+             // 写文字
+             if(item.Text){
+                 this.Canvas.fillText( item.Text, x + txtLine + paddingX, y );
+             }else{
+                 let text = `${item.Name}:${item.Value}`;
+                 this.Canvas.fillText( text, x + txtLine + paddingX, y );
+             }
+            
+
+            start += rate*2*Math.PI;//起始角度
+        }
+
+        this.Canvas.restore();
+    }
+
+    //空数据
+    this.DrawEmptyData=function()
+    {
+        JSConsole.Chart.Log('[ChartPie::DrawEmptyData]')
+    }
+
+    this.GetMaxMin=function()
+    {
+        return { Min:null, Max:null };
+    }
+}
+
 //分钟成交量 支持横屏
 function ChartMinuteVolumBar()
 {
@@ -86503,6 +86624,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
                 {
                     var index=parseInt(position.CursorIndex.toFixed(0));
+                    if (index>=kData.Data.length) index=kData.Data.length-1;    //未开盘的时间，取最后一个数据的收盘价
                     var item=kData.Data[index];
                     if (item && IFrameSplitOperator.IsNumber(item.Close))
                     {
@@ -119703,6 +119825,10 @@ function JSExplainer(ast,option)
             ["L2_VOLNUM", { Name:"L2_VOLNUM", Param:{ Count:2 }, ToString:function(args) { return `单数分档`; } }],
             ["L2_VOL", { Name:"L2_VOL", Param:{ Count:2 }, ToString:function(args) { return `成交量分档`; } }],
             ["L2_AMO", { Name:"L2_AMO", Param:{ Count:2 }, ToString:function(args) { return `成交额分档`; } }],
+
+            ["TABLE_CELL", { Name:"TABLE_CELL",Param:{ Dynamic:true }, ToString:function(args) { return `创建表格单元格`; } }],
+            ["TABLE_ROW", { Name:"TABLE_ROW",Param:{ Dynamic:true }, ToString:function(args) { return `创建表格行`; } }],
+            ["DRAWTABLE", { Name:"DRAWTABLE",Param:{ Dynamic:true }, ToString:function(args) { return `绘制表格`; } }]
             
         ]
     );
@@ -146633,7 +146759,7 @@ function JSPopKeyboard()
             }
         }
     
-        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122) || code==8)
+        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=96 && code<=122) || code==8)
         {
             var strText=this.InputDOM.value;
             strText=strText.toUpperCase();
@@ -146731,7 +146857,7 @@ function JSPopKeyboard()
         var code=event.keyCode;
         if (code==116) return;  //F5不处理
 
-        if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122))
+        if (!this.IsShow() && (code>=48 && code<=57) || (code>=65 && code<=90) || (code>=96 && code<=122))
         {
             this.Show();
             this.InputDOM.focus();
@@ -151001,7 +151127,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14294";
+var HQCHART_VERSION="1.1.14298";
 
 function PrintHQChartVersion()
 {