hqchart 1.1.14026 → 1.1.14033

package/src/jscommon/umychart.TReport.js

@@ -892,16 +892,16 @@ function JSTReportChartContainer(uielement)
 
 
         //10个字符型 201-299
-        if (IFrameSplitOperator.IsString(item[201])) stock.ReserveString1=item[201];
-        if (IFrameSplitOperator.IsString(item[202])) stock.ReserveString2=item[202];
-        if (IFrameSplitOperator.IsString(item[203])) stock.ReserveString3=item[203];
-        if (IFrameSplitOperator.IsString(item[204])) stock.ReserveString4=item[204];
-        if (IFrameSplitOperator.IsString(item[205])) stock.ReserveString5=item[205];
-        if (IFrameSplitOperator.IsString(item[206])) stock.ReserveString6=item[206];
-        if (IFrameSplitOperator.IsString(item[207])) stock.ReserveString7=item[207];
-        if (IFrameSplitOperator.IsString(item[208])) stock.ReserveString8=item[208];
-        if (IFrameSplitOperator.IsString(item[209])) stock.ReserveString9=item[209];
-        if (IFrameSplitOperator.IsString(item[210])) stock.ReserveString10=item[210];
+        if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
+        if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
+        if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
+        if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
+        if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
+        if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
+        if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
+        if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
+        if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
+        if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
     }
 
     
@@ -1268,6 +1268,43 @@ function JSTReportChartContainer(uielement)
         else e.returnValue = false;
     }
 
+    this.MoveSelectedRowEvent=function(oldData, nowData)
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart) return null;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOVE_SELECTED_TREPORT_ROW);
+        if (!event || !event.Callback) return;
+
+        if (oldData && nowData)
+        {
+            if (oldData.ExePrice==nowData.ExePrice && oldData.CellType==nowData.CellType) return;
+        }
+
+        if (oldData)
+        {
+            if (chart.GetExePriceDataCallback) oldData.TData=chart.GetExePriceDataCallback(oldData.ExePrice);
+            if (oldData.TData)
+            {
+                if (oldData.CellType==1) oldData.Item=oldData.TData.LeftData;
+                else if (oldData.CellType==2) oldData.Item=oldData.TData.RightData;
+            }
+        }
+
+        if (nowData)
+        {
+            if (chart.GetExePriceDataCallback) nowData.TData=chart.GetExePriceDataCallback(nowData.ExePrice);
+            if (nowData.TData)
+            {
+                if (nowData.CellType==1) nowData.Item=nowData.TData.LeftData;
+                else if (nowData.CellType==2) nowData.Item=nowData.TData.RightData;
+            }
+        }
+
+        var endData={ Old:oldData, Now:nowData, Symbol:this.Symbol };
+        event.Callback(event, endData, this);
+    }
+
     //是否循环翻页 { EnablePageCycle: true/false }
     this.MoveSelectedRow=function(step, option)
     {
@@ -1299,13 +1336,19 @@ function JSTReportChartContainer(uielement)
                 }
             }
         }
-        
+
+        var oldData=null, nowData=null;
+        if (chart.SelectedRow) oldData=CloneData(chart.SelectedRow);    //上一个数据保存下
+
         if (step>0)
         {
             if (selectedIndex<0 || selectedIndex<pageStatus.Start || selectedIndex>pageStatus.End)
             {
                 chart.SelectedRow={ ExePrice:this.Data.Data[pageStatus.Start], CellType:cellType };
                 result.Redraw=true;
+
+                nowData=CloneData(chart.SelectedRow);
+                this.MoveSelectedRowEvent(oldData,nowData);
                 return result;
             }
 
@@ -1331,6 +1374,8 @@ function JSTReportChartContainer(uielement)
             chart.SelectedRow={ ExePrice:this.Data.Data[selectedIndex], CellType:cellType };
             this.Data.YOffset=offset;
 
+            nowData=CloneData(chart.SelectedRow);
+            this.MoveSelectedRowEvent(oldData,nowData);
             return result;
         }
         else if (step<0)
@@ -1339,6 +1384,9 @@ function JSTReportChartContainer(uielement)
             {
                 chart.SelectedRow={ ExePrice:this.Data.Data[pageStatus.End], CellType:cellType };
                 result.Redraw=true;
+
+                nowData=CloneData(chart.SelectedRow);
+                this.MoveSelectedRowEvent(oldData,nowData);
                 return result;
             }
 
@@ -1366,6 +1414,8 @@ function JSTReportChartContainer(uielement)
             chart.SelectedRow={ ExePrice:this.Data.Data[selectedIndex], CellType:cellType };
             this.Data.YOffset=offset;
 
+            nowData=CloneData(chart.SelectedRow);
+            this.MoveSelectedRowEvent(oldData,nowData);
             return result;
         }
 
@@ -2419,10 +2469,17 @@ function ChartTReport()
         var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);
         if (!fieldName) return;
 
-        var text=data[fieldName];
-        if (!IFrameSplitOperator.IsString(text)) return;
-
-        drawInfo.Text=text;
+        var item=data[fieldName];
+        if (IFrameSplitOperator.IsObject(item))
+        {
+            if (item.Text) drawInfo.Text=item.Text;
+            if (item.TextColor) drawInfo.TextColor=item.TextColor;
+            if (item.BGColor) drawInfo.BGColor=item.BGColor;
+        }
+        else if (IFrameSplitOperator.IsString(item))
+        {
+            drawInfo.Text=item;
+        }
     }
 
     this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)

package/src/jscommon/umychart.js

@@ -2615,6 +2615,7 @@ var JSCHART_EVENT_ID=
     ON_RCLICK_TREPORT_HEADER:125,             //右键点击T型报价表头
     ON_TREPORT_LOCAL_SORT:126,                //T型报价列表本地排序
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
+    ON_MOVE_SELECTED_TREPORT_ROW:128,      //选中行变动
 
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
@@ -48326,6 +48327,11 @@ IFrameSplitOperator.IsUndefined=function(value)
     return value===undefined;
 }
 
+IFrameSplitOperator.IsObject=function(value)
+{
+    return value instanceof Object;
+}
+
 IFrameSplitOperator.RemoveZero=function(strValue)
 {
     while(strValue.length>0)
@@ -69300,6 +69306,12 @@ function JSChartResource()
         BorderColor:'rgb(20,20,20)',        //边框颜色
         TitleColor:'rgb(0,0,0)',            //对话框标题颜色
         TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+
+        Input:
+        {
+            BGColor:"rgb(250,250,250)",
+            TextColor:"rgb(0,0,0)",
+        }
     };
 
     //弹幕
@@ -70342,6 +70354,13 @@ function JSChartResource()
             if (item.BorderColor) this.DialogPopKeyboard.BorderColor=item.BorderColor;
             if (item.TitleColor) this.DialogPopKeyboard.TitleColor=item.TitleColor;
             if (item.TitleBGColor) this.DialogTooltip.TitleBGColor=item.TitleBGColor;
+
+            if (item.Input)
+            {
+                var subItem=item.Input;
+                if (subItem.BGColor) this.DialogPopKeyboard.Input.BGColor=subItem.BGColor;
+                if (subItem.TextColor) this.DialogPopKeyboard.Input.TextColor=subItem.TextColor;
+            }
         }
 
         if (style.MinuteInfo)
@@ -70796,6 +70815,79 @@ function JSChartResource()
 
         if (style.FrameButtomToolbar)
             this.SetFrameButtomToolbar(style.FrameButtomToolbar);
+
+
+        if (style.Keyboard) this.SetKeyboardStyle(style.Keyboard);
+    }
+
+
+    this.SetKeyboardStyle=function(style)
+    {
+        var item=style;
+        var dest=this.Keyboard;
+
+        if (item.BorderColor) dest.BorderColor=item.BorderColor;
+        if (item.SelectedColor) dest.SelectedColor=item.SelectedColor;
+        if (item.TextColor) dest.TextColor=item.TextColor;
+
+        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.BarMergin)
+            {
+                var mergin=row.BarMergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Item.BarMergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Item.BarMergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Item.BarMergin.Right=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Item.BarMergin.Bottom=mergin.Bottom;
+            }
+
+            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.VScrollbar)
+        {
+            var scroll=item.VScrollbar;
+            if (IFrameSplitOperator.IsNumber(scroll.ScrollBarHeight)) dest.VScrollbar.ScrollBarHeight=scroll.ScrollBarHeight;
+            if (scroll.ButtonColor)  dest.VScrollbar.ButtonColor=scroll.ButtonColor;
+            if (scroll.BarColor)  dest.VScrollbar.BarColor=scroll.BarColor;
+            if (scroll.BorderColor)  dest.VScrollbar.BorderColor=scroll.BorderColor;
+            if (scroll.BGColor)  dest.VScrollbar.BGColor=scroll.BGColor;
+            if (scroll.BarWidth)
+            {
+                var subItem=scroll.BarWidth;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) dest.VScrollbar.BarWidth.Size=subItem.Size;
+            }
+        }
     }
 
     this.SetReportStyle=function(style)

package/src/jscommon/umychart.style.js

@@ -423,6 +423,19 @@ function GetBlackStyle()
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
             PositionColor:"rgb(255,0,255)"            //持仓
         },
+
+        DialogPopKeyboard:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+            TitleColor:'rgb(240,240,240)',       //标题颜色
+
+            Input:
+            {
+                BGColor:"rgb(20,20,20)",
+                TextColor:"rgb(250,250,250)",
+            }
+        },
         
         //走势图 信息地雷
         MinuteInfo:
@@ -758,6 +771,33 @@ function GetBlackStyle()
             },
         },
 
+        //键盘精灵
+        Keyboard:
+        {
+            BorderColor:'rgb(38,38,41)',    //边框线
+            SelectedColor:"rgb(49,48,56)",  //选中行
+            TextColor:"rgb(245,245,245)",
+
+            Item:
+            {
+                Mergin:{ Top:2, Bottom:0,Left:1, Right:1 }, //单元格四周间距
+                Font:{ Size:15, Name:"微软雅黑"},
+                BarMergin:{ Top:2, Left:0, Right:0, Bottom:2 },//单元格字体
+                NameFont:{ Size:14, Name:"微软雅黑" },
+                SymbolFont:{ Size:12, Name:"微软雅黑" }
+            },
+
+            VScrollbar:
+            {
+                ScrollBarHeight:50,
+                ButtonColor:"rgba(13,12,15,0.8)",
+                BarColor:"rgba(48,48,48,0.9)",
+                BorderColor:'rgba(48,48,48,0.9)',
+                BGColor:"rgba(211,211,211,0.5)",
+                BarWidth:{ Size:8 }
+            },
+        },
+
         ScrollBar:
         {
             BorderColor:'rgb(38,38,41)',    //边框线

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

@@ -6540,6 +6540,7 @@ var JSCHART_EVENT_ID=
     ON_RCLICK_TREPORT_HEADER:125,             //右键点击T型报价表头
     ON_TREPORT_LOCAL_SORT:126,                //T型报价列表本地排序
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
+    ON_MOVE_SELECTED_TREPORT_ROW:128,      //选中行变动
 
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
@@ -52251,6 +52252,11 @@ IFrameSplitOperator.IsUndefined=function(value)
     return value===undefined;
 }
 
+IFrameSplitOperator.IsObject=function(value)
+{
+    return value instanceof Object;
+}
+
 IFrameSplitOperator.RemoveZero=function(strValue)
 {
     while(strValue.length>0)
@@ -73225,6 +73231,12 @@ function JSChartResource()
         BorderColor:'rgb(20,20,20)',        //边框颜色
         TitleColor:'rgb(0,0,0)',            //对话框标题颜色
         TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+
+        Input:
+        {
+            BGColor:"rgb(250,250,250)",
+            TextColor:"rgb(0,0,0)",
+        }
     };
 
     //弹幕
@@ -74267,6 +74279,13 @@ function JSChartResource()
             if (item.BorderColor) this.DialogPopKeyboard.BorderColor=item.BorderColor;
             if (item.TitleColor) this.DialogPopKeyboard.TitleColor=item.TitleColor;
             if (item.TitleBGColor) this.DialogTooltip.TitleBGColor=item.TitleBGColor;
+
+            if (item.Input)
+            {
+                var subItem=item.Input;
+                if (subItem.BGColor) this.DialogPopKeyboard.Input.BGColor=subItem.BGColor;
+                if (subItem.TextColor) this.DialogPopKeyboard.Input.TextColor=subItem.TextColor;
+            }
         }
 
         if (style.MinuteInfo)
@@ -74721,6 +74740,79 @@ function JSChartResource()
 
         if (style.FrameButtomToolbar)
             this.SetFrameButtomToolbar(style.FrameButtomToolbar);
+
+
+        if (style.Keyboard) this.SetKeyboardStyle(style.Keyboard);
+    }
+
+
+    this.SetKeyboardStyle=function(style)
+    {
+        var item=style;
+        var dest=this.Keyboard;
+
+        if (item.BorderColor) dest.BorderColor=item.BorderColor;
+        if (item.SelectedColor) dest.SelectedColor=item.SelectedColor;
+        if (item.TextColor) dest.TextColor=item.TextColor;
+
+        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.BarMergin)
+            {
+                var mergin=row.BarMergin;
+                if (IFrameSplitOperator.IsNumber(mergin.Left)) dest.Item.BarMergin.Left=mergin.Left;
+                if (IFrameSplitOperator.IsNumber(mergin.Top)) dest.Item.BarMergin.Top=mergin.Top;
+                if (IFrameSplitOperator.IsNumber(mergin.Right)) dest.Item.BarMergin.Right=mergin.Right;
+                if (IFrameSplitOperator.IsNumber(mergin.Bottom)) dest.Item.BarMergin.Bottom=mergin.Bottom;
+            }
+
+            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.VScrollbar)
+        {
+            var scroll=item.VScrollbar;
+            if (IFrameSplitOperator.IsNumber(scroll.ScrollBarHeight)) dest.VScrollbar.ScrollBarHeight=scroll.ScrollBarHeight;
+            if (scroll.ButtonColor)  dest.VScrollbar.ButtonColor=scroll.ButtonColor;
+            if (scroll.BarColor)  dest.VScrollbar.BarColor=scroll.BarColor;
+            if (scroll.BorderColor)  dest.VScrollbar.BorderColor=scroll.BorderColor;
+            if (scroll.BGColor)  dest.VScrollbar.BGColor=scroll.BGColor;
+            if (scroll.BarWidth)
+            {
+                var subItem=scroll.BarWidth;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) dest.VScrollbar.BarWidth.Size=subItem.Size;
+            }
+        }
     }
 
     this.SetReportStyle=function(style)
@@ -125187,6 +125279,19 @@ function GetBlackStyle()
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
             PositionColor:"rgb(255,0,255)"            //持仓
         },
+
+        DialogPopKeyboard:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+            TitleColor:'rgb(240,240,240)',       //标题颜色
+
+            Input:
+            {
+                BGColor:"rgb(20,20,20)",
+                TextColor:"rgb(250,250,250)",
+            }
+        },
         
         //走势图 信息地雷
         MinuteInfo:
@@ -125522,6 +125627,33 @@ function GetBlackStyle()
             },
         },
 
+        //键盘精灵
+        Keyboard:
+        {
+            BorderColor:'rgb(38,38,41)',    //边框线
+            SelectedColor:"rgb(49,48,56)",  //选中行
+            TextColor:"rgb(245,245,245)",
+
+            Item:
+            {
+                Mergin:{ Top:2, Bottom:0,Left:1, Right:1 }, //单元格四周间距
+                Font:{ Size:15, Name:"微软雅黑"},
+                BarMergin:{ Top:2, Left:0, Right:0, Bottom:2 },//单元格字体
+                NameFont:{ Size:14, Name:"微软雅黑" },
+                SymbolFont:{ Size:12, Name:"微软雅黑" }
+            },
+
+            VScrollbar:
+            {
+                ScrollBarHeight:50,
+                ButtonColor:"rgba(13,12,15,0.8)",
+                BarColor:"rgba(48,48,48,0.9)",
+                BorderColor:'rgba(48,48,48,0.9)',
+                BGColor:"rgba(211,211,211,0.5)",
+                BarWidth:{ Size:8 }
+            },
+        },
+
         ScrollBar:
         {
             BorderColor:'rgb(38,38,41)',    //边框线
@@ -139041,7 +139173,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14025";
+var HQCHART_VERSION="1.1.14032";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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