hqchart 1.1.13541 → 1.1.13550

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

@@ -6567,6 +6567,8 @@ var JSCHART_EVENT_ID=
     ON_TREPORT_LOCAL_SORT:126,                //T型报价列表本地排序
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 
+    ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
+
 
     ON_CHANGE_INDEX:150,        //切换指标
     ON_MENU_COMMAND:151,        //菜单事件回调
@@ -71093,8 +71095,17 @@ function JSChartResource()
         {
             Color:"rgb(60,60,60)",      //表头文字颜色
             SortColor:"rgb(255,0,0)",   //排序箭头颜色
-            Mergin:{ Left:5, Right:5, Top:4, Bottom:2},    //表头四周间距
-            Font:{ Size:12, Name:"微软雅黑" }   //表头字体
+            Mergin:{ Left:5, Right:5, Top:4, Bottom:4 },    //表头四周间距
+            Font:{ Size:12, Name:"微软雅黑" },   //表头字体
+        },
+
+        //排序图标
+        SortIcon:
+        {
+            Size:12, Family:"iconfont",
+            Arrow:[null, "\ue6b2", "\ue6b1"],
+            Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
+            Margin:{ Left:0, Bottom:6 }
         },
 
         Item:
@@ -72039,7 +72050,6 @@ function JSChartResource()
         {
             var header=item.Header;
             if (header.Color) this.Report.Header.Color=header.Color;
-            if (header.SortColor) this.Report.Header.SortColor=header.SortColor;
             if (header.Mergin)
             {
                 var mergin=header.Mergin;
@@ -123520,7 +123530,7 @@ function GetBlackStyle()
             {
                 Color:"RGB(245,245,245)",
                 SortColor:"rgb(255,0,0)",
-                Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
+                //Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
                 Font:{ Size:12, Name:"微软雅黑" }
             },
     
@@ -128851,7 +128861,7 @@ function ChartReport()
     //表头配置
     this.HeaderFontConfig={ Size:g_JSChartResource.Report.Header.Font.Size, Name:g_JSChartResource.Report.Header.Font.Name };
     this.HeaderColor=g_JSChartResource.Report.Header.Color;
-    this.SortColor=g_JSChartResource.Report.Header.SortColor;      //排序箭头颜色
+    
     this.HeaderMergin=
     { 
         Left:g_JSChartResource.Report.Header.Mergin.Left, 
@@ -128860,6 +128870,20 @@ function ChartReport()
         Bottom:g_JSChartResource.Report.Header.Mergin.Bottom
     };
 
+    //排序图标
+    this.SortConfig=
+    {
+        Size:g_JSChartResource.Report.SortIcon.Size, 
+        Family:g_JSChartResource.Report.SortIcon.Family,
+        Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),
+        Color:g_JSChartResource.Report.SortIcon.Color.slice(),
+        Margin:
+        { 
+            Left:g_JSChartResource.Report.SortIcon.Margin.Left, 
+            Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom
+        }
+    }
+
     //表格内容配置
     this.ItemFontConfig={ Size:g_JSChartResource.Report.Item.Font.Size, Name:g_JSChartResource.Report.Item.Font.Name };
     this.ItemFixedFontConfg={ Size:g_JSChartResource.Report.FixedItem.Font.Size, Name:g_JSChartResource.Report.FixedItem.Font.Name }; //固定行
@@ -128922,6 +128946,7 @@ function ChartReport()
 
     //缓存
     this.HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
+    this.SortFont=null,
     this.ItemFont=15*GetDevicePixelRatio() +"px 微软雅黑";
     this.ItemFixedFont=15*GetDevicePixelRatio() +"px 微软雅黑";
     this.ItemSymbolFont=12*GetDevicePixelRatio() +"px 微软雅黑";
@@ -128965,7 +128990,7 @@ function ChartReport()
         //表头配置
         this.HeaderFontConfig={ Size:g_JSChartResource.Report.Header.Font.Size, Name:g_JSChartResource.Report.Header.Font.Name };
         this.HeaderColor=g_JSChartResource.Report.Header.Color;
-        this.SortColor=g_JSChartResource.Report.Header.SortColor;      //排序箭头颜色
+        
         this.HeaderMergin=
         { 
             Left:g_JSChartResource.Report.Header.Mergin.Left, 
@@ -129000,6 +129025,20 @@ function ChartReport()
             Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom
         }
 
+        //排序图标
+        this.SortConfig=
+        {
+            Size:g_JSChartResource.Report.SortIcon.Size, 
+            Family:g_JSChartResource.Report.SortIcon.Family,
+            Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),
+            Color:g_JSChartResource.Report.SortIcon.Color.slice(),
+            Margin:
+            { 
+                Left:g_JSChartResource.Report.SortIcon.Margin.Left, 
+                Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom
+            }
+        }
+
         for(var i=0;i<this.Column.length;++i)
         {
             var item=this.Column[i];
@@ -129326,6 +129365,7 @@ function ChartReport()
 
         this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
         this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
+        this.SortFont=`${this.SortConfig.Size*pixelRatio}px ${ this.SortConfig.Family}`;
 
         this.Canvas.font=this.ItemFont;
         var itemWidth=0;
@@ -129378,8 +129418,8 @@ function ChartReport()
             var item=this.Column[i];
             if (!item.Title || item.Title.length<=0) continue;
             var text=item.Title;
-            if (item.Sort>0) text+="↓"; 
             itemWidth=this.Canvas.measureText(text).width;
+            if (item.Sort>0) itemWidth+this.SortConfig.Size*pixelRatio;
             itemWidth+=(4+this.HeaderMergin.Left+this.HeaderMergin.Right);
             if (item.Width<itemWidth) item.Width=itemWidth;
         }
@@ -129387,7 +129427,6 @@ function ChartReport()
         this.HeaderHeight=this.GetFontHeight(this.HeaderFont,"擎")+ this.HeaderMergin.Top+ this.HeaderMergin.Bottom;
         if (!this.IsShowHeader) this.HeaderHeight=0;
         if (this.FixedRowCount<=0) this.FixedRowHeight=0;
-
         
         this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight-(this.FixedRowHeight*this.FixedRowCount))/this.RowHeight);
 
@@ -129409,6 +129448,7 @@ function ChartReport()
         var left=this.RectClient.Left;
         var top=this.RectClient.Top;
         var y=top+this.HeaderMergin.Top+(this.HeaderHeight-this.HeaderMergin.Top-this.HeaderMergin.Bottom)/2;
+        var yBottom=top+this.HeaderHeight;
 
         this.Canvas.font=this.HeaderFont;
         
@@ -129448,16 +129488,16 @@ function ChartReport()
             var textSize={ }
             if (this.SortInfo && this.SortInfo.Field==i && this.SortInfo.Sort>0)
             {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,y,textWidth,this.SortInfo.Sort, textSize);
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort, textSize);
             }
             else
             {
-                this.DrawText(item.Title,item.TextAlign,x,y,textWidth,textSize);
+                this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
             }
 
             if (iconWidth>0)
             {
-                this.DrawHeaderIcon(item.Icon, textSize.Right, y, i, item);
+                this.DrawHeaderIcon(item.Icon, textSize.Right, yBottom, i, item);
                 this.Canvas.font=this.HeaderFont;
             }
 
@@ -129501,16 +129541,16 @@ function ChartReport()
             var textSize={ }
             if (this.SortInfo && this.SortInfo.Field==i && this.SortInfo.Sort>0)
             {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,y,textWidth,this.SortInfo.Sort,textSize);
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort,textSize);
             }
             else
             {
-                this.DrawText(item.Title,item.TextAlign,x,y,textWidth,textSize);
+                this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
             }
 
             if (iconWidth>0)
             {
-                this.DrawHeaderIcon(item.Icon, textSize.Right, y, i, item);
+                this.DrawHeaderIcon(item.Icon, textSize.Right, yBottom, i, item);
                 this.Canvas.font=this.HeaderFont;
             }
 
@@ -129518,7 +129558,7 @@ function ChartReport()
         } 
     }
 
-    this.DrawText=function(text, textAlign, x, y, cellWidth, textSize)
+    this.DrawText=function(text, textAlign, x, yBottom, cellWidth, textSize)
     {
         var textWidth=this.Canvas.measureText(text).width;
         if (textAlign=='center')
@@ -129531,8 +129571,8 @@ function ChartReport()
         }
 
         this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="middle";
-        this.Canvas.fillText(text,x,y);
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.fillText(text,x,yBottom-this.HeaderMergin.Bottom);
 
         if (textSize) 
         {
@@ -129541,7 +129581,7 @@ function ChartReport()
         }
     }
 
-    this.DrawHeaderIcon=function(icon, x, y, index, column)
+    this.DrawHeaderIcon=function(icon, x, yBottom, index, column)
     {
         var iconFont=`${icon.Size}px ${icon.Family}`;
         this.Canvas.font=iconFont;
@@ -129549,29 +129589,29 @@ function ChartReport()
         if (icon.Color) this.Canvas.fillStyle=icon.Color;
 
         var xIcon=x;
-        var yIcon=y;
+        var yIcon=yBottom;
         if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Left)) xIcon+=icon.Margin.Left;
         if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Bottom)) yIcon-=icon.Margin.Bottom;
         this.Canvas.fillText(icon.Symbol, xIcon, yIcon);
 
         if (icon.Tooltip)
         {
-            var rtIcon={ Left:xIcon, Top:yIcon-icon.Size/2, Width:icon.Size, Height:icon.Size };
+            var rtIcon={ Left:xIcon, Bottom:yIcon, Width:icon.Size, Height:icon.Size };
             rtIcon.Right=rtIcon.Left+rtIcon.Width;
-            rtIcon.Bottom=rtIcon.Top+rtIcon.Height;
+            rtIcon.Top=rtIcon.Bottom-rtIcon.Height;
 
             var tooltipData={ Rect:rtIcon, Type:2, Column:column, Index:index, Data:icon.Tooltip.Data };
             this.TooltipRect.push(tooltipData);
         }
     }
 
-    this.DrawSortHeader=function(text, textAlign, x, y, width, sortType,textSize)
+    this.DrawSortHeader=function(text, textAlign, x, yBottom, width, sortType,textSize)
     {
-        var sortText=sortType==1?"↓":"↑";
-        var sortTextWidth=this.Canvas.measureText(sortText).width;
-        var textWidth=this.Canvas.measureText(text).width+2;
-        this.Canvas.textBaseline="middle";
-        this.Canvas.textAlign="left";
+        var pixelRatio=GetDevicePixelRatio();
+        var sortText=this.SortConfig.Arrow[sortType];
+        this.Canvas.font=this.HeaderFont;
+        var textWidth=this.Canvas.measureText(text).width;
+        var sortTextWidth=this.SortConfig.Size*pixelRatio+this.SortConfig.Margin.Left;
 
         if (textAlign=='center')
         {
@@ -129582,9 +129622,20 @@ function ChartReport()
             x=(x+width)-sortTextWidth-textWidth;
         }
 
-        this.Canvas.fillText(text,x,y);
-        this.Canvas.fillStyle=this.SortColor;
-        this.Canvas.fillText(sortText,x+textWidth,y);
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.textAlign="left";
+
+        var xText=x;
+        this.Canvas.font=this.HeaderFont;
+        this.Canvas.fillStyle=this.HeaderColor;
+        this.Canvas.fillText(text,xText,yBottom-this.HeaderMergin.Bottom);
+
+        xText+=(textWidth+this.SortConfig.Margin.Left);
+        this.Canvas.font=this.SortFont;
+        this.Canvas.fillStyle=this.SortConfig.Color[sortType];
+        this.Canvas.fillText(sortText,xText,yBottom-this.SortConfig.Margin.Bottom);
+
+        this.Canvas.font=this.HeaderFont;
         this.Canvas.fillStyle=this.HeaderColor;
 
         if (textSize)
@@ -129690,6 +129741,9 @@ function ChartReport()
 
         textTop=top+this.FixedRowHeight*this.FixedRowCount;
         this.Canvas.font=this.ItemFont;
+
+        var eventDrawBG=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_REPORT_ROW_BG);
+        var selectedSymbol=this.GetSelectedSymbol();
         for(var i=this.Data.YOffset, j=0; i<this.Data.Data.length && j<this.RowCount ;++i, ++j)
         {
             var symbol=this.Data.Data[i];
@@ -129729,6 +129783,18 @@ function ChartReport()
                 bFillRow=false;
             }
 
+            if (eventDrawBG && eventDrawBG.Callback)
+            {
+                //Out:{ BGColor: } 
+                var sendData={ RowIndex:i, Symbol:symbol, Out:null, Selected:selectedSymbol };
+                eventDrawBG.Callback(eventDrawBG,sendData,this);
+                if (sendData.Out && sendData.Out.BGColor)
+                {
+                    this.Canvas.fillStyle=sendData.Out.BGColor;
+                    this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);   
+                }
+            }
+
             if (bFillRow)
             {
                 this.Canvas.fillStyle=this.SelectedColor;
@@ -129743,6 +129809,18 @@ function ChartReport()
         }
     }
 
+    this.GetSelectedSymbol=function()
+    {
+        if (this.SelectedRow<0) return null;
+
+        var index=this.SelectedRow;
+        if (this.SelectedModel==0)  //当前屏选中
+            index=this.Data.YOffset+this.SelectedRow;
+
+        var symbol=this.Data.Data[index];
+        return symbol;
+    }
+
 
     this.DrawFixedSymbolRow=function(top, dataIndex)
     { 
@@ -137749,6 +137827,7 @@ function JSPopMenu()
         
         
         var rootData={ Root:root, TBody:tbody, Table:table };
+        root.JSMenuData=rootData;
         for(var i=0;i<data.Menu.length;++i)
         {
             var item=data.Menu[i];
@@ -137851,6 +137930,7 @@ function JSPopMenu()
             subTable.appendChild(subTbody);
        
             var subRootData={ Root:subRoot, TBody:subTbody, Table:subTable };
+            subRoot.JSMenuData=subRootData;
             var preTrDom=null;
             for(var i=0;i<item.SubMenu.length;++i)
             {
@@ -137986,6 +138066,17 @@ function JSPopMenu()
             parentItem.PopMenu.style.visibility="hidden";
             if (parentItem.PopRow) parentItem.PopRow.classList.remove(this.SelectedClassName);
 
+            var popMenuData=parentItem.PopMenu.JSMenuData;
+            for(var i=0;i<50;++i)   //隐藏子菜单 最多50层
+            {
+                if (!popMenuData) break;
+                if (!popMenuData.PopMenu) break;
+
+                popMenuData.PopMenu.style.visibility="hidden";
+
+                popMenuData=popMenuData.PopMenu;
+            }
+
             parentItem.PopMenu=null;
             parentItem.PopRow=null;
         }
@@ -139189,7 +139280,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13540";
+var HQCHART_VERSION="1.1.13549";
 
 function PrintHQChartVersion()
 {