hqchart 1.1.13555 → 1.1.13565

package/src/jscommon/umychart.js

@@ -2600,6 +2600,7 @@ var JSCHART_EVENT_ID=
 
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
+    ON_CLICK_REPORT_BUTTON:142,             //报价列表按钮
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -2772,8 +2773,12 @@ var JSCHART_MENU_ID=
 
     CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID:38,
 
+    CMD_SHOW_CORSS_LINE_ID:39,          //显示十字光标线
+
 
     CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
+
+    
 }
 
 
@@ -9555,6 +9560,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     if (this.ChartDragSelectRect) this.ChartDragSelectRect.ShowMode=param;
                 }
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID:
+                if (IFrameSplitOperator.IsBool(srcParam))
+                {
+                    if (this.ChartCorssCursor) this.ChartCorssCursor.IsShowCorss=srcParam;
+                }
+                break;
         }
     }
 
@@ -50889,8 +50901,9 @@ function HQPriceStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_Y_TEXT);
             if (event)
             {
-                var data={ Value:this.Value, FrameID:this.FrameID };
+                var data={ Value:this.Value, FrameID:this.FrameID, PreventDefault:false };
                 event.Callback(event,data,this);
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -50965,8 +50978,10 @@ function HQDateStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_X_TEXT);
             if (event)
             {
-                var data={ Item:currentData, Period:this.Data.Period, Date:currentData.Date, Time:currentData.Time,Index:this.Data.DataOffset+index };
+                var data={ Item:currentData, Period:this.Data.Period, Date:currentData.Date, Time:currentData.Time,Index:this.Data.DataOffset+index, PreventDefault:false };
                 event.Callback(event,data,this);
+
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -51105,8 +51120,10 @@ function HQMinuteTimeStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_X_TEXT);
             if (event)
             {
-                var data={ Time:time, Index:showIndex };
+                var data={ Time:time, Index:showIndex, PreventDefault:false };
                 event.Callback(event,data,this);
+
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -67142,7 +67159,7 @@ function JSChartResource()
 
         Item:
         {
-            Mergin:{ Top:2, Bottom:0,Left:5, Right:5 }, //单元格四周间距
+            Mergin:{ Top:2, Bottom:4,Left:5, Right:5 }, //单元格四周间距
             Font:{ Size:15, Name:"微软雅黑"},
             BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
             NameFont:{ Size:14, Name:"微软雅黑" },
@@ -74913,6 +74930,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (this.GetExtendChartByClassName("SessionBreaksPaint")) bBGSpit=true;
         if (this.GetExtendChartByClassName('StockChip')) bShowStockChip=true;       //筹码
 
+        var bShowCorss=false;   //十字光标十字线
+        if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
+
         var aryMenu=
         [
             { 
@@ -75071,6 +75091,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
+
+                    { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
+
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
                     { 
                         Name:"鼠标形状", 
@@ -78575,6 +78598,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (item && item.Symbol) aryOverlaySymbol.push(item.Symbol)
         }
 
+        var bShowCorss=false;   //十字光标十字线
+        if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
+
         var aryMenu=
         [
             { 
@@ -78643,6 +78669,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 SubMenu:
                 [
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
+                    { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
 
                     {
                         Name:"区间选择样式", 
@@ -78652,7 +78679,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                             { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[1]}, Checked:1==this.ChartDragSelectRect.ShowMode },
                             { Name:"样式3", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[2]}, Checked:2==this.ChartDragSelectRect.ShowMode },
                         ]
-                    }
+                    },
+
+                    
                 ]
             }
 

package/src/jscommon/umychart.report.js

@@ -3671,13 +3671,7 @@ var REPORT_COLUMN_ID=
     TIME_ID:31,             //时间 hhmmss / hhmm / hhmmss.fff
     DATE_ID:32,             //日期
 
-    CHECKBOX_ID:33,         //单选框
-    CHECKBOX2_ID:34,
-    CHECKBOX3_ID:35,
-    CHECKBOX4_ID:36,
-    CHECKBOX5_ID:37,
-    CHECKBOX6_ID:38,
-    
+    CHECKBOX_ID:33,         //单选框 
 
     SYMBOL_NAME_ID:99,
 
@@ -3685,6 +3679,8 @@ var REPORT_COLUMN_ID=
     CUSTOM_NUMBER_TEXT_ID:101,      //自定义数值型
     CUSTOM_DATETIME_TEXT_ID:102,    //自定义日期类型
     CUSTOM_ICON_ID:103,             //自定义图标
+    CUSTOM_CHECKBOX_ID:104,         //自定义checkbox
+    CUSTOM_BUTTON_ID:105,           //自定义按钮
 }
 
 var MAP_COLUMN_FIELD=new Map([
@@ -4053,6 +4049,21 @@ function ChartReport()
                 if (IFrameSplitOperator.IsNumber(item.ValueType)) colItem.FormatType=item.ValueType;   //输出样式
                 
             }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID)
+            {
+                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
+                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+                if (item.CheckBox) colItem.CheckBox=CloneData(item.CheckBox);
+                else colItem.CheckBox=CloneData(g_JSChartResource.Report.CheckBox);
+            }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+            {
+                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
+                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+                if (item.Button) colItem.Button=CloneData(item.Button);
+            }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
             {
 
@@ -4069,6 +4080,7 @@ function ChartReport()
             {
                 if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;
             }
+            
 
             this.Column.push(colItem);
         }
@@ -4165,9 +4177,11 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.TIME_ID, Title:"时间", TextAlign:"left", ValueType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"99:99:99.999" },
             { Type:REPORT_COLUMN_ID.DATE_ID, Title:"日期", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
 
-            { Type:REPORT_COLUMN_ID.CHECKBOX_ID, Title:"", TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() }
+            { Type:REPORT_COLUMN_ID.CHECKBOX_ID, Title:"", TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
-            
+            { Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID, Title:"",  TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
+
+            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() }
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -5116,10 +5130,30 @@ function ChartReport()
             rtItem.Bottom=rtItem.Top+rtItem.Height;
             drawInfo.Rect=rtItem;
             drawInfo.Checked=false;
-            drawInfo.Font=`${this.CheckBoxConfig.Size*this.DevicePixelRatio}px ${this.CheckBoxConfig.Family}`;
+            drawInfo.Enable=true;
+            drawInfo.CheckBox=this.CheckBoxConfig;
+            drawInfo.Data=stock;
             if (stock && IFrameSplitOperator.IsBool(stock.Checked))
                 drawInfo.Checked=stock.Checked;
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID)
+        {
+            rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+
+            this.GetCustomCheckBoxDrawInfo(data, column, drawInfo);
+        }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+        {
+            rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+            
+            this.GetCustomButtonDrawInfo(data, column, drawInfo);
+        }
         
 
         //拖拽行颜色
@@ -5134,10 +5168,14 @@ function ChartReport()
         {
             this.DrawIconItem(drawInfo, x, top, textWidth);
         }
-        else if (column.Type==REPORT_COLUMN_ID.CHECKBOX_ID)
+        else if (column.Type==REPORT_COLUMN_ID.CHECKBOX_ID || column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID)
         {
             this.DrawCheckbox(drawInfo, left, top, itemWidth);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+        {
+            this.DrawButton(drawInfo, left, top, itemWidth);
+        }
         else
         {
             if (data.FlashBG && data.FlashBG.Data && column.ID!=undefined)
@@ -5171,7 +5209,7 @@ function ChartReport()
 
         if (drawInfo.Botton)
         {
-            var buttonData={ Stock:stock, Index:index, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type };
+            var buttonData={ Stock:stock, Index:index, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type, Data:drawInfo.Data };
             this.ButtonRect.push(buttonData);
         }
     }
@@ -5231,9 +5269,9 @@ function ChartReport()
             }
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=drawInfo.TextColor;
-        this.Canvas.fillText(text,x,top+this.ItemMergin.Top+this.RowHeight/2);
+        this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
 
         if (bClip) this.Canvas.restore();
     }
@@ -5427,6 +5465,32 @@ function ChartReport()
         }
     }
 
+    this.GetCustomCheckBoxDrawInfo=function(data, column, drawInfo)
+    {
+        var checkData=this.GetExtendData(data, column);
+        if (!checkData) return;
+        if (!IFrameSplitOperator.IsBool(checkData.Checked)) return;
+
+        drawInfo.Checked=checkData.Checked;
+        drawInfo.Enable=true;
+        drawInfo.Data=checkData;
+        if (IFrameSplitOperator.IsBool(checkData.DisableCheckBox)) drawInfo.Enable=!checkData.DisableCheckBox;
+        drawInfo.CheckBox=column.CheckBox;
+    }
+
+    this.GetCustomButtonDrawInfo=function(data, column, drawInfo)
+    {
+        var buttonData=this.GetExtendData(data, column);
+        if (!buttonData) return;
+
+        drawInfo.Text=buttonData.Title;
+        drawInfo.Button=column.Button;
+        drawInfo.Font=column.Button.Font;
+        drawInfo.Enable=true;
+        drawInfo.Data=buttonData;
+        if (IFrameSplitOperator.IsBool(buttonData.Enable)) drawInfo.Enable=buttonData.Enable;
+    }
+
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
         if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -5587,9 +5651,9 @@ function ChartReport()
             }
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=textColor;
-        this.Canvas.fillText(text,x,top+this.ItemMergin.Top+this.RowHeight/2);
+        this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
 
         if (bClip) this.Canvas.restore();
     }
@@ -5693,32 +5757,80 @@ function ChartReport()
 
     this.DrawCheckbox=function(drawInfo, left, top, width)
     {
+        if (!IFrameSplitOperator.IsBool(drawInfo.Checked)) return;
+        if (!drawInfo.CheckBox) return;
+
+        drawInfo.Font=`${drawInfo.CheckBox.Size*this.DevicePixelRatio}px ${drawInfo.CheckBox.Family}`;
         var textAlign=drawInfo.TextAlign;
-        var size=this.CheckBoxConfig.Size*this.DevicePixelRatio;
-        //var boxWidth=size+this.CheckBoxConfig.Margin.Left+this.CheckBoxConfig.Margin.Right;
-        var x=left+this.CheckBoxConfig.Margin.Left;
-        var y=top+this.RowHeight-this.CheckBoxConfig.Margin.Bottom;
+        var size=drawInfo.CheckBox.Size*this.DevicePixelRatio;
+        var x=left+drawInfo.CheckBox.Margin.Left;
+        var y=top+this.RowHeight-drawInfo.CheckBox.Margin.Bottom;
         if (textAlign=='center') x=left+width/2-size/2;
-        else if (textAlign=='right') x=left+width-this.CheckBoxConfig.Margin.Right;
+        else if (textAlign=='right') x=left+width-drawInfo.CheckBox.Margin.Right;
 
         this.Canvas.font=drawInfo.Font;
         this.Canvas.textBaseline="bottom";
         this.Canvas.textAlign="left";
         if (drawInfo.Checked===true)
         {
-            this.Canvas.fillStyle=this.CheckBoxConfig.Checked.Color;
-            this.Canvas.fillText(this.CheckBoxConfig.Checked.Symbol,x,y);
+            if (drawInfo.Enable===false)  this.Canvas.fillStyle=drawInfo.CheckBox.Checked.DisableColor;
+            else this.Canvas.fillStyle=drawInfo.CheckBox.Checked.Color;
+            this.Canvas.fillText(drawInfo.CheckBox.Checked.Symbol,x,y);
         }
         else if (drawInfo.Checked===false)
         {
-            this.Canvas.fillStyle=this.CheckBoxConfig.Unchecked.Color;
-            this.Canvas.fillText(this.CheckBoxConfig.Unchecked.Symbol,x,y);
+            if (drawInfo.Enable===false)  this.Canvas.fillStyle=drawInfo.CheckBox.Unchecked.DisableColor;
+            else this.Canvas.fillStyle=drawInfo.CheckBox.Unchecked.Color;
+            this.Canvas.fillText(drawInfo.CheckBox.Unchecked.Symbol,x,y);
         }
 
-        var rtBox={ Left:x, Bottom:y, Width:size, Height:size };
-        rtBox.Right=rtBox.Left+rtBox.Width;
-        rtBox.Top=rtBox.Bottom-rtBox.Height;
-        drawInfo.Botton={ Rect:rtBox, Type:0 };
+        if (drawInfo.Enable)
+        {
+            var rtBox={ Left:x, Bottom:y, Width:size, Height:size };
+            rtBox.Right=rtBox.Left+rtBox.Width;
+            rtBox.Top=rtBox.Bottom-rtBox.Height;
+            drawInfo.Botton={ Rect:rtBox, Type:0 };
+        }
+    }
+
+    this.DrawButton=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.Button) return;
+
+        var rtBG=
+        { 
+            Left:left+drawInfo.Button.Margin.Left, Top:top+drawInfo.Button.Margin.Top, 
+            Height:this.RowHeight-drawInfo.Button.Margin.Top-drawInfo.Button.Margin.Bottom, 
+            Width:width-drawInfo.Button.Margin.Left-drawInfo.Button.Margin.Right
+        }
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        var bgColor=drawInfo.Button.BGColor, textColor=drawInfo.Button.TextColor;
+        if (drawInfo.Enable===false)
+        {
+            bgColor=drawInfo.Button.Disable.BGColor;
+            textColor=drawInfo.Button.Disable.TextColor;
+        }
+
+        this.Canvas.fillStyle=bgColor;
+        this.Canvas.fillRect(rtBG.Left, rtBG.Top,rtBG.Width,rtBG.Height);
+
+        this.Canvas.font=drawInfo.Font;
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.textAlign="left";
+        this.Canvas.fillStyle=textColor;
+        var textWidth=this.Canvas.measureText(drawInfo.Text).width;
+
+        var x=rtBG.Left;
+        if (textWidth<rtBG.Width) x+=(rtBG.Width-textWidth)/2;
+        var y=rtBG.Bottom-drawInfo.Button.TextMargin.Bottom;
+        this.Canvas.fillText(drawInfo.Text,x,y);
+
+        if (drawInfo.Enable)
+        {
+            drawInfo.Botton={ Rect:rtBG, Type:1 };
+        }
     }
 
     //字体由外面设置
@@ -6409,22 +6521,30 @@ function ChartReport()
         var buttonData=this.GetButtonData(x,y);
         if (!buttonData) return true;
         
-        if (buttonData.Type===0)
+        if (buttonData.Type===0)    //checkbox
         {
-            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, PreventDefault: false };
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data, PreventDefault: false };
             this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_CHECKBOX, sendData)
 
             if (!sendData.PreventDefault)
             {
-                if (IFrameSplitOperator.IsBool(buttonData.Stock.Checked))
-                    buttonData.Stock.Checked=!buttonData.Stock.Checked;
+                if (IFrameSplitOperator.IsBool(buttonData.Data.Checked))
+                    buttonData.Data.Checked=!buttonData.Data.Checked;
                 else 
-                    buttonData.Stock.Checked=true;
+                    buttonData.Data.Checked=true;
             }
 
             status.Redraw=true;
             return true;
         }
+        else if (buttonData.Type===1)   //button
+        {
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data };
+            this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_BUTTON, sendData)
+
+            status.Redraw=true;
+            return true;
+        }
         
         return false;
     }
@@ -6679,7 +6799,7 @@ function ChartReport()
 
             if (x>=rt.Left && x<=rt.Right && y>=rt.Top && y<=rt.Bottom)
             {
-                return { Rect:item.Rect, Stock:item.Stock, Column:item.Column, Index:item.Index, Type:item.Type };
+                return { Rect:item.Rect, Stock:item.Stock, Column:item.Column, Index:item.Index, Type:item.Type, Data:item.Data };
             }
         }
     }

package/src/jscommon/umychart.style.js

@@ -532,7 +532,7 @@ function GetBlackStyle()
     
             Item:
             {
-                Mergin:{ Top:2, Bottom:0,Left:5, Right:5 },
+                Mergin:{ Top:2, Bottom:4,Left:5, Right:5 },
                 Font:{ Size:15, Name:"微软雅黑"},
                 BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },
                 NameFont:{ Size:14, Name:"微软雅黑" },