hqchart 1.1.14291 → 1.1.14299

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14291",
+  "version": "1.1.14299",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55745,6 +55745,8 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
+        stockItem.minute.length=50;
+
         var hqchartData={code:0, stock:[stockItem] };
     
 
@@ -57370,6 +57372,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_SVGICON(data, callback);
     else if (request.Data.indexname=="API-DRAWTEXT_LINE")
         HQData.APIIndex_DRAWTEXT_LINE(data, callback);
+    else if (request.Data.indexname=="API_DRAW_SIMPLE_TABLE")
+        HQData.APIIndex_DRAW_SIMPLE_TABLE(data, callback);
 }
 
 
@@ -57792,4 +57796,48 @@ HQData.APIIndex_DRAWTEXT_LINE=function(data, callback)
     callback(apiData);
 }
 
+HQData.APIIndex_DRAW_SIMPLE_TABLE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_TABLE', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_TABLE', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(0,0,255)",
+                //TextColor:"rgb(0,191,255)",
+                TableData:
+                [
+                    { AryCell:[{ Text:"股票代码"}, { Text:"主营业务", TextAlign:'center'}, { Text:"每股收益(元)"}] },
+                    { AryCell:[{ Text:"美丽生态"}, { Text:"园林绿化"}, { Text:"13.5", Color:"rgb(139,0,139)"}] },
+                    { AryCell:[{ Text:"深物业A"}, { Text:"房地产及相关业务", BGColor:"rgb(200,200,200)"}, { Text:"0.12"}] },
+                    { AryCell:[{ Text:"深科技"}, { Text:"计算机硬件、通讯设备等"}, { Text:"5.4"}] },
+                ],
+
+                //TextFont:{ Size:16, Name:"微软雅黑"},
+                //XOffset:-10,
+                //YOffset:-15,
+            }
+        } 
+    };
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime() , outvar:[tableData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_DRAW_SIMPLE_TABLE] apiData ', apiData);
+    callback(apiData);
+}
+
 

package/src/jscommon/umychart.PopKeyboard.js

@@ -179,7 +179,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();
@@ -277,7 +277,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();

package/src/jscommon/umychart.complier.js

@@ -11489,10 +11489,24 @@ function JSDraw(errorHandler,symbolData)
     }
 
     //表格
-    this.TABLE_CELL=function(text, color, textAlign)
+    this.TABLE_CELL=function(data, color, textAlign, bgColor)
     {
+        var text=null;
+        if (IFrameSplitOperator.IsString(data)) 
+        {
+            text=data;
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(data))
+        {
+            var precision=2;
+            var lastValue=data[data.length-1];
+            if (IFrameSplitOperator.IsNumber(lastValue)) text=lastValue.toFixed(precision);
+            else if (IFrameSplitOperator.IsString(lastValue)) text=lastValue;
+        }
+
         var cellItem={ Text:text };
         if (color) cellItem.Color=color;
+        if (bgColor) cellItem.BGColor=bgColor;
         if (IFrameSplitOperator.IsString(textAlign))
         {
             var strValue=textAlign.toLowerCase();   //转小写
@@ -18452,7 +18466,7 @@ function JSExecute(ast,option)
 
             //表格函数
             case "TABLE_CELL":
-                node.Out=this.Draw.TABLE_CELL(args[0],args[1],args[2]);
+                node.Out=this.Draw.TABLE_CELL(args[0],args[1],args[2],args[3]);
                 break;
             case "TABLE_ROW":
                 node.Out=this.Draw.TABLE_ROW(args);
@@ -19359,6 +19373,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 `绘制表格`; } }]
             
         ]
     );

package/src/jscommon/umychart.js

@@ -31761,6 +31761,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()
 {
@@ -81216,18 +81337,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     }
 
     //十字光标解锁
-    this.UnlockCorssCursor=function()
+    this.UnlockCorssCursor=function(option)
     {
         var xItem=this.GlobalOption.LockCorssCursor.X;
         xItem.Enable=false;
         xItem.KLine=null;
+
+        if (option && option.Draw) this.Draw();
     }
 
-    this.LockCorssCursor=function()
+    this.LockCorssCursor=function(option)
     {
+        if (this.CursorIndex<0) return false;
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
+        var dataIndex=kData.DataOffset+parseInt(this.CursorIndex.toFixed(0));
+        var kItem=kData.Data[dataIndex];
+        if (!kItem) return false;
+
         var xItem=this.GlobalOption.LockCorssCursor.X;
-        xItem.KLine={ DataIndex:null, Date:null, Time:null };
+        xItem.KLine={ DataIndex:dataIndex, Date:kItem.Date, Time:kItem.Time };
         xItem.Enable=true;
+
+        if (option && option.Draw) this.Draw();
+        return true;
     }
 
     this.GetCorssCursorPosition=function()
@@ -81243,7 +81377,19 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var xItem=this.GlobalOption.LockCorssCursor.X;
         if (xItem.Enable && xItem.KLine)
         {
-            position.CursorIndex=xItem.KLine.CursorIndex;
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return position;
+
+            position.CursorIndex=xItem.KLine.DataIndex-kData.DataOffset;
+            position.LastPoint.X=this.Frame.GetXFromIndex(position.CursorIndex);
+
+            var border=this.Frame.ChartBorder.GetBorder();
+            if (position.LastPoint.Y<border.Top || position.LastPoint.Y>border.Bottom)  //超出图形框子, 调整为收盘价
+            {
+                var kItem=kData.Data[xItem.KLine.DataIndex];
+                var y = this.Frame.SubFrame[0].Frame.GetYFromData(kItem.Close);
+                position.LastPoint.Y=y;
+            }
         }
 
         return position;
@@ -82436,13 +82582,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
-    this.LockCorssCursor=function()
+    this.LockCorssCursor=function(option)
     {
         var xItem=this.GlobalOption.LockCorssCursor.X;
         
         if (this.EnableNewIndex)
         {
-            if (this.CorssCursorIndex.Type!=1 && this.CorssCursorIndex.Type!=10) return;    //目前只支持连续交易时间段
+            if (this.CorssCursorIndex.Type!=1 && this.CorssCursorIndex.Type!=10) return false;    //目前只支持连续交易时间段
 
             xItem.Minute=
             { 
@@ -82458,13 +82604,19 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
 
         xItem.Enable=true;
+
+        if (option && option.Draw) this.Draw();
+
+        return true;
     }
 
-    this.UnlockCorssCursor=function()
+    this.UnlockCorssCursor=function(option)
     {
         var xItem=this.GlobalOption.LockCorssCursor.X;
         xItem.Enable=false;
         xItem.Minute=null;
+
+        if (option && option.Draw) this.Draw();
     }
 
     this.GetCorssCursorPosition=function()
@@ -82503,6 +82655,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))
                     {

package/src/jscommon/umychart.testdata.js

@@ -231,6 +231,8 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
+        stockItem.minute.length=50;
+
         var hqchartData={code:0, stock:[stockItem] };
     
 
@@ -1856,6 +1858,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_SVGICON(data, callback);
     else if (request.Data.indexname=="API-DRAWTEXT_LINE")
         HQData.APIIndex_DRAWTEXT_LINE(data, callback);
+    else if (request.Data.indexname=="API_DRAW_SIMPLE_TABLE")
+        HQData.APIIndex_DRAW_SIMPLE_TABLE(data, callback);
 }
 
 
@@ -2278,4 +2282,48 @@ HQData.APIIndex_DRAWTEXT_LINE=function(data, callback)
     callback(apiData);
 }
 
+HQData.APIIndex_DRAW_SIMPLE_TABLE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var tableData= 
+    { 
+        name:'DRAW_SIMPLE_TABLE', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAW_SIMPLE_TABLE', 
+            DrawData: 
+            {
+                //BGColor:"rgba(250,250,210,0.8)",
+                //BorderColor:"rgb(0,0,255)",
+                //TextColor:"rgb(0,191,255)",
+                TableData:
+                [
+                    { AryCell:[{ Text:"股票代码"}, { Text:"主营业务", TextAlign:'center'}, { Text:"每股收益(元)"}] },
+                    { AryCell:[{ Text:"美丽生态"}, { Text:"园林绿化"}, { Text:"13.5", Color:"rgb(139,0,139)"}] },
+                    { AryCell:[{ Text:"深物业A"}, { Text:"房地产及相关业务", BGColor:"rgb(200,200,200)"}, { Text:"0.12"}] },
+                    { AryCell:[{ Text:"深科技"}, { Text:"计算机硬件、通讯设备等"}, { Text:"5.4"}] },
+                ],
+
+                //TextFont:{ Size:16, Name:"微软雅黑"},
+                //XOffset:-10,
+                //YOffset:-15,
+            }
+        } 
+    };
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime() , outvar:[tableData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_DRAW_SIMPLE_TABLE] apiData ', apiData);
+    callback(apiData);
+}
+