hqchart 1.1.14084 → 1.1.14097

package/src/jscommon/umychart.report.js

@@ -5092,6 +5092,7 @@ function ChartReport()
         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;
+        var bDrawSortBG=this.IsDrawSortBGIcon();
 
         this.Canvas.font=this.HeaderFont;
         
@@ -5133,6 +5134,10 @@ function ChartReport()
             {
                 this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort, textSize);
             }
+            else if (item.Sort>0 && bDrawSortBG)
+            {
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0,textSize);
+            }
             else
             {
                 this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
@@ -5186,6 +5191,10 @@ function ChartReport()
             {
                 this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort,textSize);
             }
+            else if (item.Sort>0)
+            {
+                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0, textSize);
+            }
             else
             {
                 this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
@@ -5248,10 +5257,24 @@ function ChartReport()
         }
     }
 
+    //是否绘制排序背景图标
+    this.IsDrawSortBGIcon=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SortConfig.Arrow)) return false;
+        if (!this.SortConfig.Arrow[0]) return false;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SortConfig.Color)) return false;
+        if (!this.SortConfig.Color[0]) return false;
+
+        return true;
+    }
+
     this.DrawSortHeader=function(text, textAlign, x, yBottom, width, sortType,textSize)
     {
         var pixelRatio=GetDevicePixelRatio();
         var sortText=this.SortConfig.Arrow[sortType];
+        var sortBGText=this.SortConfig.Arrow[0];
+        var sortBGColor=this.SortConfig.Color[0];
         this.Canvas.font=this.HeaderFont;
         var textWidth=this.Canvas.measureText(text).width;
         var sortTextWidth=this.SortConfig.Size*pixelRatio+this.SortConfig.Margin.Left;
@@ -5275,8 +5298,17 @@ function ChartReport()
 
         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);
+        if (sortBGText && sortBGColor)
+        {
+            this.Canvas.fillStyle=sortBGColor;
+            this.Canvas.fillText(sortBGText,xText,yBottom-this.SortConfig.Margin.Bottom);
+        }
+
+        if (sortType>0)
+        {
+            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;
@@ -5288,7 +5320,6 @@ function ChartReport()
         }
     }
 
-
     this.DrawBorder=function()
     {
         if (!this.IsDrawBorder) return;
@@ -6067,7 +6098,7 @@ function ChartReport()
     this.DrawSymbolName=function(data, column, left, top, rowType)
     {
         var stock=data.Stock;
-        var symbol=data.Symbol;
+        var symbol=IFrameSplitOperator.RemoveMarketSuffix(data.Symbol);
         var name;
         if (stock)
         {
@@ -6124,7 +6155,7 @@ function ChartReport()
     this.DrawSymbolNameV2=function(data, column, left, top, rowType)
     {
         var stock=data.Stock;
-        var symbol=data.Symbol;
+        var symbol=IFrameSplitOperator.RemoveMarketSuffix(data.Symbol);
         var name;
         if (stock)
         {

package/src/jscommon/umychart.resource/css/tools.css

@@ -1221,6 +1221,7 @@ input[type="color"] {
     font-family: "微软雅黑";
     cursor: default;
     padding: 2px;
+    z-index: 99;
     
 }
 
@@ -1356,6 +1357,7 @@ input[type="color"] {
     background-color: rgba(250,250,250,1);
     left:1px;
     top:1px;
+    z-index: 99;
 }
 
 .UMyChart_DrawTool_Title_Div
@@ -1462,6 +1464,7 @@ input[type="color"] {
     left:1px;
     top:1px;
     display: flex;
+    z-index: 99;
 }
 
 .UMyChart_Draw_Modify_Dialog_Drag_Div
@@ -1510,6 +1513,7 @@ input[type="color"] {
     border: solid 1px rgba(200, 210, 219, 0.92);
     display: flex;
     flex-flow: column;  
+    z-index: 99;
 }
 
 .jschart_pop_minute_chart
@@ -1563,6 +1567,7 @@ input[type="color"] {
     border: solid 1px rgb(0, 0, 0);
     display: flex;
     flex-flow: column;  
+    z-index: 99;
 }
 
 .jschart_keyboard_Title_Div
@@ -1634,6 +1639,7 @@ input[type="color"] {
     background-color: rgba(20,20,20,1);
     left:1px;
     top:1px;
+    z-index: 99;
     
 }
 
@@ -1728,6 +1734,7 @@ input[type="color"] {
     background-color: rgba(230,230,230,1);
     left:1px;
     top:1px; 
+    z-index: 99;
 }
 
 .UMyChart_SelectRect_Title_Div
@@ -1868,6 +1875,7 @@ input[type="color"] {
     left:1px;
     top:1px;
     pointer-events:none;
+    z-index: 98;
 }
 
 
@@ -1947,6 +1955,7 @@ input[type="color"] {
     background-color: rgba(20,20,20,1);
     left:1px;
     top:1px;
+    z-index: 99;
 }
 
 .UMyChart_SearchIndex_Title_Div
@@ -2044,6 +2053,133 @@ input[type="color"] {
 }
 
 
+/*
+    Copyright (c) 2018 jones
+ 
+    http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   内置修改指标参数对话框
+*/
+
+
+.UMyChart_ModifyIndexParam_Dialog_Div
+{
+    font-family: "微软雅黑";
+    /*display: flex;*/
+    border: 1px solid; 
+    width:fit-content;
+    border-color: rgb(204,204,204);
+    visibility:hidden;
+    position: absolute;
+    background-color: rgba(20,20,20,1);
+    left:1px;
+    top:1px;
+    z-index: 99;
+}
+
+.UMyChart_ModifyIndexParam_Title_Div
+{
+    padding-left: 2px;
+    height:20px;
+    border-bottom: 1px solid;
+    
+    display: flex;
+    cursor: default;
+    user-select: none;
+    background-color:rgb(200, 66, 69)
+}
+
+.UMyChart_ModifyIndexParam_Name_Div
+{
+    margin-left: 5px;
+    color:rgb(250,250,250)
+}
+
+.UMyChart_ModifyIndexParam_Close_Div
+{
+    margin-left: auto;
+    padding-right: 4px;
+    cursor:pointer;
+    color:rgb(180,180,180)
+}
+
+.UMyChart_ModifyIndexParam_Table_Div
+{
+    min-height:100px;
+    max-height: 500px;
+    width: 270px;
+    overflow-y:auto;  /*纵向滚动条始终显示 */
+}
+
+.UMyChart_ModifyIndexParam_Table
+{
+    border-spacing: 4px;
+    user-select: none;
+    font-size:13px;
+    width: 100%;
+}
+
+.UMyChart_ModifyIndexParam_Tbody
+{
+    
+}
+
+.UMyChart_ModifyIndexParam_Tr
+{
+    height: 25px;
+}
+
+.UMyChart_ModifyIndexParam_Name_Td
+{
+    width: 50px;
+}
+
+
+.UMyChart_ModifyIndexParam_Name_Span
+{
+    margin-left: 10px;
+}
+
+.UMyChart_ModifyIndexParam_Value_Td
+{
+    
+}
+
+.UMyChart_ModifyIndexParam_Input
+{
+    margin-left: 10px;
+    margin-right: 10px;
+    border:0.5px solid;
+    line-height: 16px;
+    background-color: transparent;
+    width: 60px;
+}
+
+.UMyChart_ModifyIndexParam_Button_Div
+{
+    border-top: 1px solid #ccc;
+    padding: 4px 14px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.UMyChart_ModifyIndexParam_Button_Div button
+{
+    font-size: 12px;
+    padding: 2px 10px 3px;
+    border-radius: 10px;
+    border: 1px solid #ccc;
+    cursor: pointer;
+}
+
+
+
+