hqchart 1.1.14787 → 1.1.14790

package/package.json

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

package/src/jscommon/umychart.deal.js

@@ -15,6 +15,7 @@ function JSDealChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
+    this.ResizeListener;                //大小变动监听
 
      //h5 canvas
      this.CanvasElement=document.createElement("canvas");
@@ -71,6 +72,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);   //提示信息
 
@@ -84,6 +87,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);
@@ -1637,17 +1653,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
         {
@@ -1694,6 +1730,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];

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

@@ -133828,6 +133828,7 @@ function JSDealChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
+    this.ResizeListener;                //大小变动监听
 
      //h5 canvas
      this.CanvasElement=document.createElement("canvas");
@@ -133884,6 +133885,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);   //提示信息
 
@@ -133897,6 +133900,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);
@@ -135450,17 +135466,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
         {
@@ -135507,6 +135543,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];
@@ -149113,7 +149150,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14786";
+var HQCHART_VERSION="1.1.14789";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -133872,6 +133872,7 @@ function JSDealChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
+    this.ResizeListener;                //大小变动监听
 
      //h5 canvas
      this.CanvasElement=document.createElement("canvas");
@@ -133928,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);   //提示信息
 
@@ -133941,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);
@@ -135494,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
         {
@@ -135551,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];
@@ -160082,7 +160119,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14786";
+var HQCHART_VERSION="1.1.14789";
 
 function PrintHQChartVersion()
 {