hqchart 1.1.14628 → 1.1.14630

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

@@ -36693,28 +36693,87 @@ function ChartKLineTable()
     this.ClassName='ChartKlineTable';    //类名
     this.Data;
     this.RowName;
-    this.IsShowRowName=false;
+    this.RowNamePosition=1; //0=不显示 1=左边内部  2=左边外部 3=右边外部
     this.BGColor;       //背景色
+    this.BorderColor;   //分割线颜色
 
     this.RowCount=5;                    //行数
     this.RowHeight=10;                  //行高
+    this.RowHeightType=1;               //0=均分 1=固定高度
     this.TextFontConfig=CloneData(g_JSChartResource.ChartKLineTable.TextFont);
     this.ItemMergin=CloneData(g_JSChartResource.ChartKLineTable.ItemMergin);
 
     this.TextFont;
     this.TextColor='rgb(0,0,0)';
-    this.NameColor="rgb(0,0,0)";
 
-    this.Draw=function()
+    this.AryTableData=[];
+    this.MapCache=null; //key=date/date-time  value={ Date:, Time:, Data:[ ] }
+    this.GetKValue=ChartData.GetKValue;
+    
+    this.BuildCacheData=function()
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-        if (this.NotSupportMessage)
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryTableData)) return;
+
+        for(var i=0;i<this.AryTableData.length;++i)
         {
-            this.DrawNotSupportmessage();
-            return;
+            var item=this.AryTableData[i];
+            var key=this.BuildKey(item);
+            mapData.set(key,item);
         }
+    }
 
-        if (!this.Data || !this.Data.Data) return;
+    //绘制背景色
+    this.DrawBG=function(rtBG)
+    {
+        if (!this.BGColor) return;
+
+        if (this.BGColor)
+        {
+            this.Canvas.fillStyle=this.BGColor;
+            this.Canvas.fillRect(rtBG.Left+1, rtBG.Top, rtBG.Width-1, rtBG.Height);
+        }
+    }
+
+    this.DrawBorder=function(rtBG)
+    {
+        if (!this.BorderColor) return;
+
+        var yLine=rtBG.Top;
+        for(var i=0;i<30;++i)
+        {
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(rtBG.Left,ToFixedPoint(yLine));
+            this.Canvas.lineTo(rtBG.Right,ToFixedPoint(yLine));
+            this.Canvas.stroke();
+
+            yLine+=this.RowHeight;
+            if (yLine>=rtBG.Bottom) break;
+        }
+    }
+
+    //计算行高
+    this.CalculateRowHeight=function(rtBG)
+    {
+        if (this.RowHeightType==1)
+        {
+            this.RowHeight=this.TextFontConfig.FontMaxSize+this.ItemMergin.Top+this.ItemMergin.Bottom;
+        }
+        else
+        {
+            this.RowHeight=rtBG.Height/this.RowCount;
+        }
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryTableData)) return;
+        if (!this.MapCache || this.MapCache.size<=0) return;
+        if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
 
         var isHScreen=(this.ChartFrame.IsHScreen===true);
         if (isHScreen) return;
@@ -36725,24 +36784,22 @@ function ChartKLineTable()
         var xPointCount=this.ChartFrame.XPointCount;
         var border=this.ChartFrame.GetBorder();
         var height=border.Bottom-border.TopTitle;
-        this.RowHeight=height/this.RowCount;
         var xOffset=border.LeftEx+g_JSChartResource.FrameLeftMargin;
         var chartright=border.RightEx;
         var top=border.TopTitle;
         var bottom=border.Bottom;
 
-        if (this.BGColor)
-        {
-            this.Canvas.fillStyle=this.BGColor;
-            var left=border.LeftEx;
-            var width=border.RightEx-border.LeftEx;
-            var height=bottom-top;
-            this.Canvas.fillRect(left, top, width, height);
-        }
+        //绘制背景
+        var rtBG={ Left:border.LeftEx, Top:top, Right:border.RightEx, Bottom:bottom };
+        rtBG.Width=rtBG.Right-rtBG.Left;
+        rtBG.Height=rtBG.Bottom-rtBG.Top;
+        this.DrawBG(rtBG);
 
+        this.CalculateRowHeight(rtBG);
+        
         var itemHeight=this.RowHeight;
         var itemWidth=dataWidth+distanceWidth;
-        if (itemHeight-this.ItemMergin.Top-this.ItemMergin.Bottom>0) itemHeight=itemHeight-this.ItemMergin.Left-this.ItemMergin.Right;
+        if (itemHeight-this.ItemMergin.Top-this.ItemMergin.Bottom>0) itemHeight=itemHeight-this.ItemMergin.Top-this.ItemMergin.Bottom;
         if (itemWidth-this.ItemMergin.Left-this.ItemMergin.Right>0) itemWidth=itemWidth-this.ItemMergin.Left-this.ItemMergin.Right;
 
         var font=this.GetDynamicTextFont(itemHeight, itemWidth);
@@ -36751,8 +36808,8 @@ function ChartKLineTable()
 
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
-            var item=this.Data.Data[i];
-            if (!item) continue;
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
 
             var left=xOffset;
             var right=xOffset+dataWidth+distanceWidth;
@@ -36760,15 +36817,20 @@ function ChartKLineTable()
             var x=left+(right-left)/2;
             if (x>chartright) break;
 
-            if (j==0 && this.IsShowRowName)
-            {
-                this.DrawRowName(top, bottom, left, right);
-            }
-            else
-            {
-                this.DrawRow(item, top, bottom, left, right);    //绘制一列
-            }            
+            var bDrawName=false;
+            if (j==0 && this.RowNamePosition===1) bDrawName=true;
+            if (bDrawName) this.DrawRowName(top, bottom, left, right);
+
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+            var mapItem=this.MapCache.get(key);
+            
+            if (!bDrawName) this.DrawRow(mapItem, top, bottom, left, right);    //绘制一列
         }
+
+        if (this.RowNamePosition==3) this.DrawRightRowName();
+
+        this.DrawBorder(rtBG);
     }
 
     this.DrawRowName=function(top, bottom, left, right)
@@ -36776,32 +36838,35 @@ function ChartKLineTable()
         if (!IFrameSplitOperator.IsNonEmptyArray(this.RowName)) return;
 
         var x=left,y=top, width=right-left;
+        var yOffset=3;
+        if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
         for(var i=0;i<this.RowName.length;++i)
         {
             var item=this.RowName[i];
 
             var rtBG={Left:x, Top:y, Right:right, Height:this.RowHeight, Width:width };
             rtBG.Bottom=rtBG.Top+this.RowHeight;
+            var yText=rtBG.Bottom-yOffset;
 
             if (item.Name && rtBG.Width>10)
             {
                 this.Canvas.fillStyle=item.Color?item.Color:this.TextColor;
-                this.Canvas.textBaseline='middle';
+                this.Canvas.textBaseline='bottom';
 
                 if (item.TextAlign=='right')
                 {
                     this.Canvas.textAlign='right';
-                    this.Canvas.fillText(item.Name,rtBG.Right-2,rtBG.Top+this.RowHeight/2, width-4);
+                    this.Canvas.fillText(item.Name,rtBG.Right-2,yText, width-4);
                 }
                 else if (item.TextAlign=='center')
                 {
                     this.Canvas.textAlign='center';
-                    this.Canvas.fillText(item.Name,rtBG.Left+rtBG.Width/2,rtBG.Top+this.RowHeight/2, width-4);
+                    this.Canvas.fillText(item.Name,rtBG.Left+rtBG.Width/2,yText, width-4);
                 }
                 else
                 {
                     this.Canvas.textAlign='left';
-                    this.Canvas.fillText(item.Name,rtBG.Left+2,rtBG.Top+this.RowHeight/2, width-4);
+                    this.Canvas.fillText(item.Name,rtBG.Left+2,yText, width-4);
                 }
             }
 
@@ -36809,40 +36874,129 @@ function ChartKLineTable()
         }
     }
 
+    //绘制右侧行名
+    this.DrawRightRowName=function()
+    {
+        var border=this.ChartFrame.GetBorder();
+
+        if (this.BGColor)
+        {
+            var rtRightBG={Left:border.RightEx, Top:border.TopTitle, Right:border.ChartWidth, Bottom:border.Bottom };
+            rtRightBG.Width=rtRightBG.Right-rtRightBG.Left;
+            rtRightBG.Height=rtRightBG.Bottom-rtRightBG.Top;
+            this.Canvas.fillStyle=this.BGColor;
+            this.Canvas.fillRect(rtRightBG.Left+1, rtRightBG.Top, rtRightBG.Width-1, rtRightBG.Height);
+        }
+        
+        var x=border.RightEx, y=border.TopTitle;
+        var yOffset=3;
+        if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
+        for(var i=0;i<this.RowName.length;++i)
+        {
+            var item=this.RowName[i];
+
+            var rtBG={Left:x, Top:y, Right:border.ChartWidth, Height:this.RowHeight };
+            rtBG.Bottom=rtBG.Top+this.RowHeight;
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            var yText=rtBG.Bottom-yOffset;
+
+            if (item.Name && rtBG.Width>10)
+            {
+                this.Canvas.fillStyle=item.Color?item.Color:this.TextColor;
+                this.Canvas.textBaseline='bottom';
+                this.Canvas.textAlign='left';
+                this.Canvas.fillText(item.Name,rtBG.Left+2,yText);
+            }
+
+            y+=this.RowHeight;
+        }
+    }
+    
+
     this.DrawRow=function(data, top, bottom, left, right)
     {
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+
         var x=left,y=top, width=right-left;
-        for(var i=0;i<data.length;++i)
+        var yOffset=3;
+        if (this.ItemMergin.YOffset) yOffset=this.ItemMergin.YOffset;
+        for(var i=0;i<data.Data.length;++i)
         {
-            var item=data[i];
+            var item=data.Data[i];
             var rtBG={Left:x, Top:y, Right:right, Height:this.RowHeight, Width:width };
             rtBG.Bottom=rtBG.Top+this.RowHeight;
 
-            if (item.BGColor)
+            if (IFrameSplitOperator.IsNonEmptyArray(item.AryText))  //左右显示
             {
-                this.Canvas.fillStyle=item.BGColor;
-                this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
-            }
+                var subCellWidth=rtBG.Width/item.AryText.length;
+                var xCell=rtBG.Left;
+                for(var j=0;j<item.AryText.length;++j)
+                {
+                    var subItem=item.AryText[j];
+                    var rtSubBG={ Left:xCell, Top:rtBG.Top, Bottom:rtBG.Bottom, Width:subCellWidth, Height:rtBG.Height };
+                    rtSubBG.Right=rtSubBG.Left+rtSubBG.Width;
 
-            if (item.Color && rtBG.Width>10)
-            {
-                this.Canvas.fillStyle=item.Color;
-                this.Canvas.textBaseline='middle';
+                    if (subItem && subItem.BGColor)
+                    {
+                        this.Canvas.fillStyle=subItem.BGColor;
+                        this.Canvas.fillRect(rtSubBG.Left, rtSubBG.Top, rtSubBG.Width, rtSubBG.Height);
+                    }
 
-                if (item.TextAlign=='right')
-                {
-                    this.Canvas.textAlign='right';
-                    this.Canvas.fillText(item.Text,rtBG.Right-2,rtBG.Top+this.RowHeight/2, width-4);
+                    if (subItem && subItem.Color && subCellWidth>10)
+                    {
+                        this.Canvas.fillStyle=subItem.Color;
+                        this.Canvas.textBaseline='bottom';
+                        var yText=rtSubBG.Bottom-yOffset;
+        
+                        if (subItem.TextAlign=='right')
+                        {
+                            this.Canvas.textAlign='right';
+                            this.Canvas.fillText(subItem.Text,rtSubBG.Right-2,yText, width-4);
+                        }
+                        else if (subItem.TextAlign=='center')
+                        {
+                            this.Canvas.textAlign='center';
+                            this.Canvas.fillText(subItem.Text,rtSubBG.Left+rtSubBG.Width/2,yText, width-4);
+                        }
+                        else
+                        {
+                            this.Canvas.textAlign='left';
+                            this.Canvas.fillText(subItem.Text,rtSubBG.Left+2,yText, width-4);
+                        }
+                    }
+
+                    xCell+=subCellWidth;
                 }
-                else if (item.TextAlign=='center')
+            }
+            else
+            {
+                if (item && item.BGColor)
                 {
-                    this.Canvas.textAlign='center';
-                    this.Canvas.fillText(item.Text,rtBG.Left+rtBG.Width/2,rtBG.Top+this.RowHeight/2, width-4);
+                    this.Canvas.fillStyle=item.BGColor;
+                    this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
                 }
-                else
+    
+                if (item && item.Color && rtBG.Width>10)
                 {
-                    this.Canvas.textAlign='left';
-                    this.Canvas.fillText(item.Text,rtBG.Left+2,rtBG.Top+this.RowHeight/2, width-4);
+                    this.Canvas.fillStyle=item.Color;
+                    this.Canvas.textBaseline='bottom';
+                    var yText=rtBG.Bottom-yOffset;
+    
+                    if (item.TextAlign=='right')
+                    {
+                        this.Canvas.textAlign='right';
+                        this.Canvas.fillText(item.Text,rtBG.Right-2,yText, width-4);
+                    }
+                    else if (item.TextAlign=='center')
+                    {
+                        this.Canvas.textAlign='center';
+                        this.Canvas.fillText(item.Text,rtBG.Left+rtBG.Width/2,yText, width-4);
+                    }
+                    else
+                    {
+                        this.Canvas.textAlign='left';
+                        this.Canvas.fillText(item.Text,rtBG.Left+2,yText, width-4);
+                    }
                 }
             }
 
@@ -126523,16 +126677,41 @@ function ScriptIndex(name,script,args,option)
         chart.HQChart=hqChart;
         chart.Identify=this.Guid;
 
-        chart.Data.Data=varItem.Draw.DrawData;
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryTableData=varItem.Draw.DrawData;
         if (IFrameSplitOperator.IsNumber(varItem.Draw.RowCount)) chart.RowCount=varItem.Draw.RowCount;
-        if (IFrameSplitOperator.IsBool(varItem.Draw.IsShowRowName)) chart.IsShowRowName=varItem.Draw.IsShowRowName;
         if (IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName)) chart.RowName=varItem.Draw.RowName;
-        if (varItem.Draw.BGColor) chart.BGColor=varItem.Draw.BGColor;
 
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.BGColor) chart.BGColor=config.BGColor;
+            if (config.TextColor) chart.TextColor=config.TextColor;
+            if (config.BorderColor) chart.BorderColor=config.BorderColor;
+            if (IFrameSplitOperator.IsNumber(config.RowNamePosition)) chart.RowNamePosition=config.RowNamePosition;
+
+            if (config.ItemMergin)
+            {
+                var subItem=config.ItemMergin;
+                if (IFrameSplitOperator.IsNumber(subItem.Left)) chart.ItemMergin.Left=subItem.Left;
+                if (IFrameSplitOperator.IsNumber(subItem.Top)) chart.ItemMergin.Top=subItem.Top;
+                if (IFrameSplitOperator.IsNumber(subItem.Bottom)) chart.ItemMergin.Bottom=subItem.Bottom;
+                if (IFrameSplitOperator.IsNumber(subItem.Right)) chart.ItemMergin.Right=subItem.Right;
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) chart.ItemMergin.YOffset=subItem.YOffset;
+            }
+           
+            if (config.TextFont)
+            {
+                var subItem=config.TextFont;
+                if (IFrameSplitOperator.IsNumber(subItem.FontMaxSize)) chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;
+                if (subItem.Family) chart.TextFontConfig.Family=subItem.Family;
+            }
+        }
+        
+        chart.BuildCacheData();
         hqChart.ChartPaint.push(chart);
 
         var titleIndex=windowIndex+1;
-
         var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);
         titleData.DataType="ChartKLineTable";
         hqChart.TitlePaint[titleIndex].Data[i]=titleData;
@@ -129524,13 +129703,11 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Name=draw.Name;
                     drawItem.Type=draw.Type;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingArray(draw.DrawData,date,time,hqChart,1);
+                    drawItem.DrawData=draw.DrawData;
                     drawItem.RowCount=draw.RowCount;
                     drawItem.RowName=draw.RowName;
-                    drawItem.IsShowRowName=draw.IsShowRowName;
-                    drawItem.BGColor=draw.BGColor;
+                    drawItem.Config=draw.Config;
                     outVarItem.Draw=drawItem;
-
                     result.push(outVarItem);
                 }
                 else if (draw.DrawType=='MULTI_TEXT')
@@ -146450,7 +146627,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14627";
+var HQCHART_VERSION="1.1.14629";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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