hqchart 1.1.13577 → 1.1.13584

package/src/jscommon/umychart.scrollbar.js

@@ -15,26 +15,36 @@ function JSScrollBarChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
-
-     //h5 canvas
-     this.CanvasElement=document.createElement("canvas");
-     this.CanvasElement.className='jsscrollbar-drawing';
-     this.CanvasElement.id=Guid();
-     this.CanvasElement.setAttribute("tabindex",0);
-     if (this.CanvasElement.style) this.CanvasElement.style.outline='none';
-     if(divElement.hasChildNodes())
-     {
-         JSConsole.Chart.Log("[JSScrollBarChart::JSScrollBarChart] divElement hasChildNodes", divElement.childNodes);
-     }
-     divElement.appendChild(this.CanvasElement);
+    this.ResizeListener;
+
+    //h5 canvas
+    this.CanvasElement=document.createElement("canvas");
+    this.CanvasElement.className='jsscrollbar-drawing';
+    this.CanvasElement.id=Guid();
+    this.CanvasElement.setAttribute("tabindex",0);
+    if (this.CanvasElement.style) this.CanvasElement.style.outline='none';
+    if(divElement.hasChildNodes())
+    {
+        JSConsole.Chart.Log("[JSScrollBarChart::JSScrollBarChart] divElement hasChildNodes", divElement.childNodes);
+    }
+    divElement.appendChild(this.CanvasElement);
 
 
     this.OnSize=function()
     {
         //画布大小通过div获取
-        var height=parseInt(this.DivElement.style.height.replace("px",""));
+        var height=this.DivElement.offsetHeight;
+        var width=this.DivElement.offsetWidth;
+        if (this.DivElement.style.height && this.DivElement.style.width)
+        {
+            if (this.DivElement.style.height.includes("px"))
+                height=parseInt(this.DivElement.style.height.replace("px",""));
+            if (this.DivElement.style.width.includes("px"))
+                width=parseInt(this.DivElement.style.width.replace("px",""));
+        }  
+
         this.CanvasElement.height=height;
-        this.CanvasElement.width=parseInt(this.DivElement.style.width.replace("px",""));
+        this.CanvasElement.width=width;
         this.CanvasElement.style.width=this.CanvasElement.width+'px';
         this.CanvasElement.style.height=this.CanvasElement.height+'px';
 
@@ -56,12 +66,14 @@ function JSScrollBarChart(divElement)
 
         if (!chart) return false;
 
+        this.JSChartContainer=chart;
+        this.DivElement.JSChart=this;   //div中保存一份
+
+        if (option.EnableResize==true) this.CreateResizeListener();
+
         if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
 
         chart.Draw();
-
-        this.JSChartContainer=chart;
-        this.DivElement.JSChart=this;   //div中保存一份
     }
 
     this.CreateJSScrollBarChartContainer=function(option)
@@ -106,6 +118,18 @@ function JSScrollBarChart(divElement)
         if (IFrameSplitOperator.IsBool(item.AutoRight)) chart.AutoMargin.Right=item.AutoRight;
     }
 
+    this.CreateResizeListener=function()
+    {
+        this.ResizeListener = new ResizeObserver((entries)=>{ this.OnDivResize(entries); });
+        this.ResizeListener.observe(this.DivElement);
+    }
+
+    this.OnDivResize=function(entries)
+    {
+        JSConsole.Chart.Log("[JSScrollBarChart::OnDivResize] entries=", entries);
+        this.OnSize( );
+    }
+
     /////////////////////////////////////////////////////////////////////////////
     //对外接口
     
@@ -251,6 +275,11 @@ function JSScrollBarChartContainer(uielement)
         this.IsDestroy=true;
     }
 
+    this.GetHQChart=function()
+    {
+        return this.HQChart;
+    }
+
     //设置事件回调
     //{event:事件id, callback:回调函数}
     this.AddEventCallback=function(object)
@@ -329,6 +358,36 @@ function JSScrollBarChartContainer(uielement)
         //this.UIElement.ontouchend=(e)=> {this.OnTouchEnd(e); } 
     }
 
+    //创建一个图形
+    this.CreateChartPaint=function(name)
+    {
+        var chart=g_ChartPaintFactory.Create(name);
+        if (!chart) return null;
+
+        chart.ChartFrame=this.Frame;
+        chart.ChartBorder=this.Frame.ChartBorder;
+        chart.Canvas=this.Canvas;
+        chart.Data=this.Frame.Data;
+        chart.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        chart.GetHQChartCallback=()=>{ return this.GetHQChart(); }
+
+        return chart;
+    }
+
+    this.GetChartPaintByClassName=function(name)
+    {
+        for(var i=0; i<this.ChartPaint.length; ++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item.ClassName==name)
+            {
+                return { Chart:item, Index:i };
+            }
+        }
+
+        return null;
+    }
+
     this.Draw=function()
     {
         if (this.UIElement.width<=0 || this.UIElement.height<=0) return; 

package/src/jscommon/umychart.style.js

@@ -627,8 +627,29 @@ function GetBlackStyle()
             CheckBox:
             {
                 Family:"iconfont", Size:15,
-                Checked:{ Color:"rgb(237,60,31)", Symbol:"\ue6b3", DisableColor:"rgb(112,128,144)" },
-                Unchecked:{ Color:"rgb(237,60,31)", Symbol:"\ue6b4", DisableColor:"rgb(112,128,144)" },
+                Checked:{ Color:"rgb(69,147,238)", Symbol:"\ue6b3", DisableColor:"rgb(120,120,120)", MouseOnColor:"rgb(69,147,238)" },
+                Unchecked:{ Color:"rgb(210,210,210)", Symbol:"\ue6b4", DisableColor:"rgb(120,120,120)", MouseOnColor:"rgb(69,147,238)" },
+            },
+
+            Link:
+            {
+                Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+                TextColor:"rgb(0,144,255)",
+
+                Disable:{ TextColor:"rgb(211,211,211)" },
+                MouseOn:{ TextColor:"rgb(0,144,255)" },
+            },
+
+            ProgressBar:
+            {
+                BGColor:"rgb(20,24,28)",
+                BarColor:"rgb(47,124,197)",
+                Margin:{ Left:2, Right:2, Bottom:2, Top:2 },
+                BarMargin:{ Left:2, Right:2, Bottom:2, Top:2 },
+                TextColor:"rgb(230,230,230)",
+                Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+                TextMargin:{ Left:40, Right:2, Bottom:2, Top:2},
+                Disable:{ BGColor:"rgb(61,61,61)", BarColor:"rgb(131,131,131)", TextColor:"rgb(159,161,159)"}
             }
         },