hqchart 1.1.14784 → 1.1.14790

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

@@ -79757,6 +79757,8 @@ function JSChartResource()
         Selected:
         {
             BGColor:"rgb(180,240,240)",
+            LineColor:"rgb(128,128,128)",
+            LineWidth:2,
         }
     },
 
@@ -80876,6 +80878,8 @@ function JSChartResource()
             {
                 var subItem=item.Selected;
                 if (subItem.BGColor) this.DealList.Selected.BGColor=subItem.BGColor;
+                if (subItem.LineColor) this.DealList.Selected.LineColor=subItem.LineColor;
+                if (IFrameSplitOperator.IsPlusNumber(subItem.LineWidth)) this.DealList.Selected.LineWidth=subItem.LineWidth;
             }
         }
 
@@ -80890,7 +80894,7 @@ function JSChartResource()
             if (IFrameSplitOperator.IsNumber(item.Radius)) this.SelectedChart.Radius=item.Radius;
             if (IFrameSplitOperator.IsNumber(item.MinSpace)) this.SelectedChart.MinSpace=item.MinSpace;
             if (item.LineColor) this.SelectedChart.LineColor=item.LineColor;
-            if (item.LineColor) this.SelectedChart.BGColor=item.BGColor;
+            if (item.BGColor) this.SelectedChart.BGColor=item.BGColor;
         }
 
         if (style.DragMovePaint)
@@ -133551,7 +133555,8 @@ function GetBlackStyle()
 
             Selected:
             {
-                BGColor:"rgb(49,48,56)",
+                BGColor:"rgba(49,48,56,0.7)",
+                LineColor:"rgb(220,220,220)",
             }
         },
     
@@ -133867,6 +133872,7 @@ function JSDealChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
+    this.ResizeListener;                //大小变动监听
 
      //h5 canvas
      this.CanvasElement=document.createElement("canvas");
@@ -133923,6 +133929,8 @@ function JSDealChart(divElement)
             }
         }
 
+        if (option.EnableResize==true) this.CreateResizeListener();
+
         if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
         if (option.FloatTooltip && option.FloatTooltip.Enable) chart.InitalFloatTooltip(option.FloatTooltip);   //提示信息
 
@@ -133936,6 +133944,19 @@ function JSDealChart(divElement)
         }
     }
 
+    this.CreateResizeListener=function()
+    {
+        this.ResizeListener = new ResizeObserver((entries)=>{ this.OnDivResize(entries); });
+        this.ResizeListener.observe(this.DivElement);
+    }
+
+    this.OnDivResize=function(entries)
+    {
+        JSConsole.Chart.Log("[JSDealChart::OnDivResize] entries=", entries);
+        this.OnSize();
+    }
+
+
     this.CreateJSDealChartContainer=function(option)
     {
         var chart=new JSDealChartContainer(this.CanvasElement);
@@ -133953,6 +133974,12 @@ function JSDealChart(divElement)
         if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
         if (IFrameSplitOperator.IsBool(option.EnableFilter)) chart.EnableFilter=option.EnableFilter;
 
+         var dealChart=chart.GetDealChart();
+         if (dealChart)
+         {
+            if (IFrameSplitOperator.IsNumber(option.SelectedStyle)) dealChart.SelectedStyle=option.SelectedStyle;
+         }
+
         //注册事件
         if (option.EventCallback)
         {
@@ -134489,12 +134516,17 @@ function JSDealChartContainer(uielement)
         }
     }
 
+    this.GetDealChart=function()
+    {
+        return this.ChartPaint[0];
+    }
+
     this.RecvDealUpdateData=function(data)
     {
         var aryDeal=JSDealChartContainer.JsonDataToDealData(data);
         if (!IFrameSplitOperator.IsNonEmptyArray(aryDeal)) return;
 
-        var chart=this.ChartPaint[0];
+        var chart=this.GetDealChart();
         if (!chart) return;
 
         if (data.UpdateType===1)    //全量更新
@@ -134565,7 +134597,14 @@ function JSDealChartContainer(uielement)
 
         var self = this;
         var marketStatus=MARKET_SUFFIX_NAME.GetMarketStatus(this.Symbol);
-        if (marketStatus==0 || marketStatus==3) return; //闭市,盘后
+        if (marketStatus==0 || marketStatus==3) //闭市,盘后
+        {
+            this.AutoUpdateTimer=setTimeout(function() 
+            { 
+                self.AutoUpdate(); 
+            },20000);
+            return;
+        } 
 
         var frequency=this.AutoUpdateFrequency;
         if (marketStatus==1) //盘前
@@ -134919,8 +134958,9 @@ JSDealChartContainer.JsonDataToDealData=function(data)
         if (item[5]) dealItem.StrTime=item[5];
         if (item[6]) dealItem.ID=item[6];
 
-        if (item[11]) dealItem.Symbol=item[11]; //股票代码
-        if (item[12]) dealItem.Name=item[12];   //股票名称
+        if (item[11]) dealItem.Symbol=item[11];     //股票代码
+        if (item[12]) dealItem.Name=item[12];       //股票名称
+        if (item[13]) dealItem.BGColor=item[13];    //整行颜色
 
         if (item[100]) dealItem.Guid=item[100];
 
@@ -135136,7 +135176,8 @@ function ChartDealList()
 
     this.BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 
-    this.SelectedConfig={ BGColor:g_JSChartResource.DealList.Selected.BGColor };
+    this.SelectedConfig={ BGColor:g_JSChartResource.DealList.Selected.BGColor, LineColor:g_JSChartResource.DealList.Selected.LineColor, LineWidth:g_JSChartResource.DealList.Selected.LineWidth };
+    this.SelectedStyle=1;               //选中行样式 1=整行填充 2=底部绘制直线
 
     //表头配置
     this.HeaderFontConfig={ Size:g_JSChartResource.DealList.Header.Font.Size, Name:g_JSChartResource.DealList.Header.Font.Name };
@@ -135458,6 +135499,7 @@ function ChartDealList()
         var left=this.RectClient.Left+this.HeaderMergin.Left;
         var dataCount=this.Data.Data.length;
         var index=this.Data.DataOffset;
+        var selectedRowData=null;
 
         if (this.ShowOrder==1)
         {
@@ -135468,17 +135510,37 @@ function ChartDealList()
                 var tableLeft=left+(this.TableWidth*i);
                 var textLeft=tableLeft;
                 var textTop=top;
-
                 for(j=0;j<this.RowCount && index>=0;++j, --index)
                 {
                     var dataItem=this.Data.Data[index];
-                    this.DrawSelectedRow(dataItem, index, rtRow);
-    
+                    var rtRow={ Left:textLeft-this.HeaderMergin.Left, Top:textTop, Height:this.RowHeight, Width:this.TableWidth };
+                    rtRow.Right=rtRow.Left+rtRow.Width;
+                    rtRow.Bottom=rtRow.Top+rtRow.Height;
+
+                    if (dataItem.BGColor)
+                    {
+                        this.Canvas.fillStyle=dataItem.BGColor;
+                        this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+                    }
+
+                    if (this.DrawSelectedRow(dataItem, index, rtRow))
+                        selectedRowData={ Rect:rtRow };
+                       
                     this.DrawRow(dataItem, textLeft, textTop, index);
+
+                    this.AryCellRect.push({ Rect:rtRow, Type:1, DataIndex:index });
     
                     textTop+=this.RowHeight;
                 }
             }
+
+            if (selectedRowData && this.SelectedStyle===2)
+            {
+                var rtBG=selectedRowData.Rect;
+                this.Canvas.fillStyle=this.SelectedConfig.LineColor;
+                var lineWidth=this.SelectedConfig.LineWidth;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth); 
+            }
         }
         else
         {
@@ -135494,7 +135556,14 @@ function ChartDealList()
                     rtRow.Right=rtRow.Left+rtRow.Width;
                     rtRow.Bottom=rtRow.Top+rtRow.Height;
 
-                    this.DrawSelectedRow(dataItem, index, rtRow);
+                    if (dataItem.BGColor)
+                    {
+                        this.Canvas.fillStyle=dataItem.BGColor;
+                        this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+                    }
+
+                    if (this.DrawSelectedRow(dataItem, index, rtRow))
+                        selectedRowData={ Rect:rtRow };
     
                     this.DrawRow(dataItem, textLeft, textTop, index);
 
@@ -135503,6 +135572,14 @@ function ChartDealList()
                     textTop+=this.RowHeight;
                 }
             }
+
+            if (selectedRowData && this.SelectedStyle===2)
+            {
+                var rtBG=selectedRowData.Rect;
+                this.Canvas.fillStyle=this.SelectedConfig.LineColor;
+                var lineWidth=this.SelectedConfig.LineWidth;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth); 
+            }
         }
     }
 
@@ -135510,6 +135587,7 @@ function ChartDealList()
     {
         var tableLeft=left;
         var tableRight=left+this.TableWidth;
+        var borderRight=this.RectClient.Right;
         for(var i=0;i<this.Column.length;++i)
         {
             var item=this.Column[i];
@@ -135624,7 +135702,8 @@ function ChartDealList()
             
             if (bDrawV2)
             {
-                this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
+                //this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
+                this.DrawItemTextV2(drawInfo, rtItem);
             }
             else
             {
@@ -135737,12 +135816,17 @@ function ChartDealList()
 
     this.DrawSelectedRow=function(data, index, rtRow)
     {
-        if (!this.SelectedData) return;
-        if (!this.SelectedData.Enable) return;
-        if (!this.SelectedData.Guid || this.SelectedData.Guid!=data.Guid) return; 
+        if (!this.SelectedData) return false;
+        if (!this.SelectedData.Enable) return false;
+        if (!this.SelectedData.Guid || this.SelectedData.Guid!=data.Guid) return false;
 
-        this.Canvas.fillStyle=this.SelectedConfig.BGColor;
-        this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+        if ( this.SelectedStyle==1)
+        {
+            this.Canvas.fillStyle=this.SelectedConfig.BGColor;
+            this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+        }
+       
+        return true;
     }
 
     this.DrawItemText=function(text, textColor, textAlign, left, top, width)
@@ -135763,9 +135847,44 @@ function ChartDealList()
             this.Canvas.textAlign="left";
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=textColor;
-        if (text) this.Canvas.fillText(text,x,top+this.RowHeight/2);
+        if (text) this.Canvas.fillText(text,x,top+this.RowHeight-2);
+    }
+
+    this.DrawItemTextV2=function(drawInfo, rtItem)
+    {
+        if (drawInfo.BGColor)
+        {
+            this.Canvas.fillStyle=drawInfo.BGColor;
+            this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height); 
+        }
+
+        if (drawInfo.Text)
+        {
+            var text=drawInfo.Text;
+            var x=rtItem.Left;
+            if (drawInfo.TextAlign=='center')
+            {
+                x=rtItem.Left+rtItem.Width/2;
+                this.Canvas.textAlign="center";
+            }
+            else if (drawInfo.TextAlign=='right')
+            {
+                x=rtItem.Left+rtItem.Width-2;
+                this.Canvas.textAlign="right";
+            }
+            else
+            {
+                x+=2;
+                this.Canvas.textAlign="left";
+            }
+
+            var textWidth=this.Canvas.measureText(text).width+1;
+            this.Canvas.textBaseline="bottom";
+            this.Canvas.fillStyle=drawInfo.TextColor;
+            this.Canvas.fillText(text,x,rtItem.Top+this.RowHeight-2);
+        }
     }
 
     this.DrawMultiBar=function(colunmInfo, data, rtItem)
@@ -160000,7 +160119,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14783";
+var HQCHART_VERSION="1.1.14789";
 
 function PrintHQChartVersion()
 {