hqchart 1.1.13081 → 1.1.13090

package/src/jscommon/umychart.js

@@ -2486,6 +2486,12 @@ var JSCHART_EVENT_ID=
 
     //T型报价
     ON_TREPORT_MARKET_STATUS:121,             //T型报价列表交易状态
+    ON_DBCLICK_TREPORT_ROW:122,               //双击T型报报价列表
+    ON_RCLICK_TREPORT_ROW:123,                //右键点击T型报价列表
+    ON_CLICK_TREPORT_HEADER:124,              //单击T型报价表头
+    ON_RCLICK_TREPORT_HEADER:125,             //右键点击T型报价表头
+    ON_TREPORT_LOCAL_SORT:126,                //T型报价列表本地排序
+    ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 }
 
 var JSCHART_OPERATOR_ID=
@@ -63985,7 +63991,7 @@ function JSChartResource()
     this.TReport=
     {
         BorderColor:'rgb(192,192,192)',    //边框线
-        SelectedColor:"rgb(180,240,240)",  //选中行
+        SelectedColor:"rgb(3,89,245)",  //选中行
         Header:
         {
             Color:"rgb(60,60,60)",      //表头文字颜色
@@ -64003,6 +64009,13 @@ function JSChartResource()
             SymbolFont:{ Size:12, Name:"微软雅黑" }
         },
 
+        CenterItem:
+        {
+            TextColor:"rgb(60,60,83)",
+            BaseTextColor:"rgb(60,60,83)",
+            BGColor:"rgb(180,180,180)"
+        },
+
         FieldColor:
         {
             Index:"rgb(60,60,60)",  //序号
@@ -64016,22 +64029,14 @@ function JSChartResource()
 
         UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
         DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
-        UnchagneTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+        UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
 
-        CloseLine:
-        {
-            CloseColor:"rgb(30,144,255)",
-            YCloseColor:"rgba(105,105,105,0.5)",  //昨收线
-            AreaColor:'rgba(0,191,255,0.2)',
-        },
+        UpBGColor:"rgb(255,220,220)",
+        DownBGColor:"rgb(190,220,190)",
 
-        KLine:
+        MarkBorder:
         {
-            UpColor:"rgb(255,0,0)",
-            DownColor:"rgb(0,128,0)",
-            UnchagneColor:'rgb(90,90,90)',
-            DataWidth:16,
-            DistanceWidth:3
+            MaxPositionColor:"rgb(192,192,192)"
         },
     },
 
@@ -64815,6 +64820,8 @@ function JSChartResource()
             }
         }
 
+        if (style.TReport) this.SetTReportStyle(style.TReport);
+
         if (style.SelectedChart)
         {
             var item=style.SelectedChart;
@@ -64914,6 +64921,103 @@ function JSChartResource()
             
         }
     }
+
+    this.SetTReportStyle=function(style)
+    {
+        var item=style;
+        var dest=this.TReport;
+
+        if (item.BorderColor) dest.BorderColor=item.BorderColor;
+        if (item.UpTextColor) dest.UpTextColor=item.UpTextColor;
+        if (item.DownTextColor) dest.DownTextColor=item.DownTextColor;
+        if (item.UnchangeTextColor) dest.UnchangeTextColor=item.UnchangeTextColor;
+        if (item.BorderColor) dest.SelectedColor=item.SelectedColor;
+
+        if (item.UpBGColor) dest.UpBGColor=item.UpBGColor;
+        if (item.DownBGColor) dest.DownBGColor=item.DownBGColor;
+
+        if (item.Header)
+        {
+            var header=item.Header;
+            if (header.Color) dest.Header.Color=header.Color;
+            if (header.SortColor) dest.Header.SortColor=header.SortColor;
+            if (header.Mergin)
+            {
+                var mergin=header.Mergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Header.Mergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Header.Mergin.Left=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Header.Mergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Header.Mergin.Bottom=mergin.Bottom;
+            }
+            if (header.Font)
+            {
+                var font=header.Font;
+                if (font.Name) dest.Header.Font.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Header.Font.Size=font.Size;
+            }
+        }
+
+        if (item.CenterItem)
+        {
+            var cell=item.CenterItem;
+            if (cell.TextColor) dest.CenterItem.TextColor=cell.TextColor;
+            if (cell.BaseTextColor) dest.CenterItem.BaseTextColor=cell.BaseTextColor;
+            if (cell.BGColor) dest.CenterItem.BGColor=cell.BGColor;
+        }
+
+        if (item.Item)
+        {
+            var row=item.Item;
+            if (row.Mergin)
+            {
+                var mergin=row.Mergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Item.Mergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Item.Mergin.Right=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Item.Mergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Item.Mergin.Bottom=mergin.Bottom;
+            }
+
+            if (row.Font)
+            {
+                var font=row.Font;
+                if (font.Name) dest.Item.Font.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.Font.Size=font.Size;
+            }
+
+            if (row.NameFont)
+            {
+                var font=row.NameFont;
+                if (font.Name) dest.Item.NameFont.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.NameFont.Size=font.Size;
+            }
+
+            if (row.SymbolFont)
+            {
+                var font=row.SymbolFont;
+                if (font.Name) dest.Item.SymbolFont.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.SymbolFont.Size=font.Size;
+            }
+        }
+
+        if (item.FieldColor)
+        {
+            var filed=item.FieldColor;
+            if (filed.Name) dest.FieldColor.Name=filed.Name;
+            if (filed.Symbol) dest.FieldColor.Symbol=filed.Symbol;
+            if (filed.Vol) dest.FieldColor.Vol=filed.Vol;
+            if (filed.Amount) dest.FieldColor.Amount=filed.Amount;
+            if (filed.Index) dest.FieldColor.Index=filed.Index;
+            if (filed.Text) dest.FieldColor.Text=filed.Text;
+            if (filed.Position) dest.FieldColor.Position=filed.Position;
+        }
+
+        if (item.MarkBorder)
+        {
+            var subIem=item.MarkBorder;
+            if (subIem.MaxPositionColor) dest.MarkBorder.MaxPositionColor=subIem.MaxPositionColor;
+        }
+            
+    }
 }
 
 var g_JSChartResource=new JSChartResource();

package/src/jscommon/umychart.report.js

@@ -3456,7 +3456,7 @@ function ChartReport()
         }
         else
         {
-            result.Star=0;
+            result.Start=0;
             result.End=0;
             result.IsEnd=true;
             result.IsSinglePage=true;

package/src/jscommon/umychart.style.js

@@ -598,6 +598,59 @@ function GetBlackStyle()
             }
         },
 
+        //T型报价
+        TReport:
+        {
+            BorderColor:'rgb(38,38,41)',    //边框线
+            SelectedColor:"rgb(180,180,180)",     //选中行
+            Header:
+            {
+                Color:"rgb(187,187,187)",      //表头文字颜色
+                SortColor:"rgb(255,0,0)",      //排序箭头颜色
+                Mergin:{ Left:5, Right:5, Top:4, Bottom:2},    //表头四周间距
+                Font:{ Size:14, Name:"微软雅黑" }   //表头字体
+            },
+
+            Item:
+            {
+                Mergin:{ Top:2, Bottom:0,Left:5, Right:5 }, //单元格四周间距
+                Font:{ Size:15, Name:"微软雅黑"},
+                BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
+                NameFont:{ Size:14, Name:"微软雅黑" },
+                SymbolFont:{ Size:12, Name:"微软雅黑" }
+            },
+
+            CenterItem:
+            {
+                TextColor:"rgb(16,226,217)",
+                BaseTextColor:"rgb(60,60,83)",
+                BGColor:"rgb(65,65,65)"
+            },
+
+            FieldColor:
+            {
+                Index:"rgb(250,250,250)",  //序号
+                Symbol:"rgb(60,60,60)",
+                Name:"rgb(250,250,250)",
+                Vol:"rgb(192,165,3)",        //成交量
+                Position:"rgb(250,250,250)",   //持仓量
+                Amount:"rgb(16,226,217)", //成交金额
+                Text:"rgb(250,250,250)",   //默认文本
+            },
+
+            UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+            DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+            UnchangeTextColor:"rgb(187,187,187)",     //平盘文字颜色 
+
+            UpBGColor:"rgb(35,5,5)",
+            DownBGColor:"rgb(5,35,5)",
+
+            MarkBorder:
+            {
+                MaxPositionColor:"rgb(192,192,0)"
+            },
+        },
+
         ScrollBar:
         {
             BorderColor:'rgb(38,38,41)',    //边框线

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

@@ -6378,6 +6378,12 @@ var JSCHART_EVENT_ID=
 
     //T型报价
     ON_TREPORT_MARKET_STATUS:121,             //T型报价列表交易状态
+    ON_DBCLICK_TREPORT_ROW:122,               //双击T型报报价列表
+    ON_RCLICK_TREPORT_ROW:123,                //右键点击T型报价列表
+    ON_CLICK_TREPORT_HEADER:124,              //单击T型报价表头
+    ON_RCLICK_TREPORT_HEADER:125,             //右键点击T型报价表头
+    ON_TREPORT_LOCAL_SORT:126,                //T型报价列表本地排序
+    ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 }
 
 var JSCHART_OPERATOR_ID=
@@ -67877,7 +67883,7 @@ function JSChartResource()
     this.TReport=
     {
         BorderColor:'rgb(192,192,192)',    //边框线
-        SelectedColor:"rgb(180,240,240)",  //选中行
+        SelectedColor:"rgb(3,89,245)",  //选中行
         Header:
         {
             Color:"rgb(60,60,60)",      //表头文字颜色
@@ -67895,6 +67901,13 @@ function JSChartResource()
             SymbolFont:{ Size:12, Name:"微软雅黑" }
         },
 
+        CenterItem:
+        {
+            TextColor:"rgb(60,60,83)",
+            BaseTextColor:"rgb(60,60,83)",
+            BGColor:"rgb(180,180,180)"
+        },
+
         FieldColor:
         {
             Index:"rgb(60,60,60)",  //序号
@@ -67908,22 +67921,14 @@ function JSChartResource()
 
         UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
         DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
-        UnchagneTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+        UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
 
-        CloseLine:
-        {
-            CloseColor:"rgb(30,144,255)",
-            YCloseColor:"rgba(105,105,105,0.5)",  //昨收线
-            AreaColor:'rgba(0,191,255,0.2)',
-        },
+        UpBGColor:"rgb(255,220,220)",
+        DownBGColor:"rgb(190,220,190)",
 
-        KLine:
+        MarkBorder:
         {
-            UpColor:"rgb(255,0,0)",
-            DownColor:"rgb(0,128,0)",
-            UnchagneColor:'rgb(90,90,90)',
-            DataWidth:16,
-            DistanceWidth:3
+            MaxPositionColor:"rgb(192,192,192)"
         },
     },
 
@@ -68707,6 +68712,8 @@ function JSChartResource()
             }
         }
 
+        if (style.TReport) this.SetTReportStyle(style.TReport);
+
         if (style.SelectedChart)
         {
             var item=style.SelectedChart;
@@ -68806,6 +68813,103 @@ function JSChartResource()
             
         }
     }
+
+    this.SetTReportStyle=function(style)
+    {
+        var item=style;
+        var dest=this.TReport;
+
+        if (item.BorderColor) dest.BorderColor=item.BorderColor;
+        if (item.UpTextColor) dest.UpTextColor=item.UpTextColor;
+        if (item.DownTextColor) dest.DownTextColor=item.DownTextColor;
+        if (item.UnchangeTextColor) dest.UnchangeTextColor=item.UnchangeTextColor;
+        if (item.BorderColor) dest.SelectedColor=item.SelectedColor;
+
+        if (item.UpBGColor) dest.UpBGColor=item.UpBGColor;
+        if (item.DownBGColor) dest.DownBGColor=item.DownBGColor;
+
+        if (item.Header)
+        {
+            var header=item.Header;
+            if (header.Color) dest.Header.Color=header.Color;
+            if (header.SortColor) dest.Header.SortColor=header.SortColor;
+            if (header.Mergin)
+            {
+                var mergin=header.Mergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Header.Mergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Header.Mergin.Left=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Header.Mergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Header.Mergin.Bottom=mergin.Bottom;
+            }
+            if (header.Font)
+            {
+                var font=header.Font;
+                if (font.Name) dest.Header.Font.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Header.Font.Size=font.Size;
+            }
+        }
+
+        if (item.CenterItem)
+        {
+            var cell=item.CenterItem;
+            if (cell.TextColor) dest.CenterItem.TextColor=cell.TextColor;
+            if (cell.BaseTextColor) dest.CenterItem.BaseTextColor=cell.BaseTextColor;
+            if (cell.BGColor) dest.CenterItem.BGColor=cell.BGColor;
+        }
+
+        if (item.Item)
+        {
+            var row=item.Item;
+            if (row.Mergin)
+            {
+                var mergin=row.Mergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Item.Mergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Item.Mergin.Right=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Item.Mergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Item.Mergin.Bottom=mergin.Bottom;
+            }
+
+            if (row.Font)
+            {
+                var font=row.Font;
+                if (font.Name) dest.Item.Font.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.Font.Size=font.Size;
+            }
+
+            if (row.NameFont)
+            {
+                var font=row.NameFont;
+                if (font.Name) dest.Item.NameFont.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.NameFont.Size=font.Size;
+            }
+
+            if (row.SymbolFont)
+            {
+                var font=row.SymbolFont;
+                if (font.Name) dest.Item.SymbolFont.Name=font.Name;
+                if (IFrameSplitOperator.IsNumber(font.Size)) dest.Item.SymbolFont.Size=font.Size;
+            }
+        }
+
+        if (item.FieldColor)
+        {
+            var filed=item.FieldColor;
+            if (filed.Name) dest.FieldColor.Name=filed.Name;
+            if (filed.Symbol) dest.FieldColor.Symbol=filed.Symbol;
+            if (filed.Vol) dest.FieldColor.Vol=filed.Vol;
+            if (filed.Amount) dest.FieldColor.Amount=filed.Amount;
+            if (filed.Index) dest.FieldColor.Index=filed.Index;
+            if (filed.Text) dest.FieldColor.Text=filed.Text;
+            if (filed.Position) dest.FieldColor.Position=filed.Position;
+        }
+
+        if (item.MarkBorder)
+        {
+            var subIem=item.MarkBorder;
+            if (subIem.MaxPositionColor) dest.MarkBorder.MaxPositionColor=subIem.MaxPositionColor;
+        }
+            
+    }
 }
 
 var g_JSChartResource=new JSChartResource();
@@ -120483,6 +120587,59 @@ function GetBlackStyle()
             }
         },
 
+        //T型报价
+        TReport:
+        {
+            BorderColor:'rgb(38,38,41)',    //边框线
+            SelectedColor:"rgb(180,180,180)",     //选中行
+            Header:
+            {
+                Color:"rgb(187,187,187)",      //表头文字颜色
+                SortColor:"rgb(255,0,0)",      //排序箭头颜色
+                Mergin:{ Left:5, Right:5, Top:4, Bottom:2},    //表头四周间距
+                Font:{ Size:14, Name:"微软雅黑" }   //表头字体
+            },
+
+            Item:
+            {
+                Mergin:{ Top:2, Bottom:0,Left:5, Right:5 }, //单元格四周间距
+                Font:{ Size:15, Name:"微软雅黑"},
+                BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
+                NameFont:{ Size:14, Name:"微软雅黑" },
+                SymbolFont:{ Size:12, Name:"微软雅黑" }
+            },
+
+            CenterItem:
+            {
+                TextColor:"rgb(16,226,217)",
+                BaseTextColor:"rgb(60,60,83)",
+                BGColor:"rgb(65,65,65)"
+            },
+
+            FieldColor:
+            {
+                Index:"rgb(250,250,250)",  //序号
+                Symbol:"rgb(60,60,60)",
+                Name:"rgb(250,250,250)",
+                Vol:"rgb(192,165,3)",        //成交量
+                Position:"rgb(250,250,250)",   //持仓量
+                Amount:"rgb(16,226,217)", //成交金额
+                Text:"rgb(250,250,250)",   //默认文本
+            },
+
+            UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+            DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+            UnchangeTextColor:"rgb(187,187,187)",     //平盘文字颜色 
+
+            UpBGColor:"rgb(35,5,5)",
+            DownBGColor:"rgb(5,35,5)",
+
+            MarkBorder:
+            {
+                MaxPositionColor:"rgb(192,192,0)"
+            },
+        },
+
         ScrollBar:
         {
             BorderColor:'rgb(38,38,41)',    //边框线
@@ -125446,7 +125603,7 @@ function ChartReport()
         }
         else
         {
-            result.Star=0;
+            result.Start=0;
             result.End=0;
             result.IsEnd=true;
             result.IsSinglePage=true;
@@ -130809,7 +130966,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13080";
+var HQCHART_VERSION="1.1.13089";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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