hqchart 1.1.13720 → 1.1.13728

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

@@ -16199,8 +16199,11 @@ function AverageWidthFrame()
         var pixelTatio = GetDevicePixelRatio();
         var defaultTextHeight=18*pixelTatio;
         var textHeight=defaultTextHeight;
+        var y;
+        if (item.Value=="Top") y=top;
+        else if (item.Value=="Bottom") y=bottom;
+        else y = this.GetYFromData(item.Value);
         
-        var y = this.GetYFromData(item.Value);
         var position=0;
         var emptyBGColor;
         if (item.ExtendData && item.ExtendData.Custom)
@@ -17739,6 +17742,7 @@ function MinuteFrame()
             {
                 case 0:
                 case 1:
+                case 10://自定义的
                     this.DrawCustomItem(item);  //自定义刻度
                     break;
             }
@@ -20377,6 +20381,7 @@ function KLineFrame()
                 case 2: //当前屏最后一个K线价格刻度
                 case 3: //主图K线涨幅刻度
                 case 4: //叠加K线涨幅刻度
+                case 10://自定义的
                     this.DrawCustomItem(item, mapTextRect);  
                     break;
             }
@@ -127951,6 +127956,7 @@ function JSReportChartContainer(uielement)
 
                 stock.Symbol=this.GetSymbolNoSuffix(symbol);
                 stock.Name=item[1];
+                if (IFrameSplitOperator.IsNumber(item[88])) stock.PriceColorType=item[88];
                 this.ReadStockJsonData(stock, item);
             }
         }
@@ -128195,7 +128201,9 @@ function JSReportChartContainer(uielement)
     {
         //0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
         //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值
-        //30=全局扩展数据  31=当前板块扩展数据
+        //30=全局扩展数据  31=当前板块扩展数据 36=日期字段
+
+        //88=价格颜色类型
 
         if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
         if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -128278,6 +128286,19 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsNumber(item[36])) stock.Date=item[36];    //日期
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
+
+        if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38];        //持仓量
+        if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39];          //结算价
+        if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40];         //昨结算价
+        if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41];    //开仓量
+        if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42];   //平仓量
+
+        //1,3,5,10,15 涨速%
+        if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
+        if (IFrameSplitOperator.IsNumber(item[44])) stock.RSpeed3M=item[44]; 
+        if (IFrameSplitOperator.IsNumber(item[45])) stock.RSpeed5M=item[45]; 
+        if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46]; 
+        if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47]; 
     }
 
 
@@ -128462,6 +128483,8 @@ function JSReportChartContainer(uielement)
         if (!reportChart) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+        if (keyID==116) return; //F15刷新不处理
+
         switch(keyID)
         {
             case 33:    //page up
@@ -130079,6 +130102,7 @@ function JSReportChartContainer(uielement)
             {
                 var item=tabItem.ArySubMenu[i];
                 var menuItem={ Name:item.Title, Data:{ ID:item.CommandID, Args:[item.ID]} };
+                if (item.Text) menuItem.Text=item.Text;
 
                 aryMenu.push(menuItem);
             }
@@ -130769,6 +130793,20 @@ var REPORT_COLUMN_ID=
 
     CHECKBOX_ID:33,         //单选框 
 
+    FUTURES_POSITION_ID:34,      //期货持仓量
+    FUTURES_CLOSE_ID:35,         //期货结算价
+    FUTURES_YCLOSE_ID:36,        //期货昨结算
+    FUTURES_OPEN_POSITION_ID:37,    //期货开仓量
+    FUTURES_CLOSE_POSITION_ID:38,    //期货平仓量
+
+
+    //1,3,5,10,15分钟涨速
+    RISING_SPEED_1M_ID:60,  
+    RISING_SPEED_3M_ID:61,  
+    RISING_SPEED_5M_ID:62,
+    RISING_SPEED_10M_ID:63,
+    RISING_SPEED_15M_ID:64,
+
     SYMBOL_NAME_ID:99,
 
     CUSTOM_STRING_TEXT_ID:100,      //自定义字符串文本
@@ -130781,6 +130819,7 @@ var REPORT_COLUMN_ID=
     CUSTOM_LINK_ID:107,              //链接
 }
 
+//数据对应字段名对照表
 var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.SYMBOL_ID, "Symbol"],
     [REPORT_COLUMN_ID.NAME_ID, "Name"],
@@ -130816,6 +130855,18 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.NAME_EX_ID, "NameEx"],
 
     [REPORT_COLUMN_ID.DATE_ID, "Date"],
+
+    [REPORT_COLUMN_ID.FUTURES_POSITION_ID, "Position"],
+    [REPORT_COLUMN_ID.FUTURES_CLOSE_ID, "FClose"],
+    [REPORT_COLUMN_ID.FUTURES_YCLOSE_ID, "YFClose"],
+    [REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID, "OpenPosition"],
+    [REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID, "ClosePosition"],
+
+    [REPORT_COLUMN_ID.RISING_SPEED_1M_ID, "RSpeed1M"],
+    [REPORT_COLUMN_ID.RISING_SPEED_3M_ID, "RSpeed3M"],
+    [REPORT_COLUMN_ID.RISING_SPEED_5M_ID, "RSpeed5M"],
+    [REPORT_COLUMN_ID.RISING_SPEED_10M_ID, "RSpeed10M"],
+    [REPORT_COLUMN_ID.RISING_SPEED_15M_ID, "RSpeed15M"],
 ]);
 
 function ChartReport()
@@ -131319,7 +131370,19 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
             { Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID, Title:"进度条", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
-            { Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID, Title:"链接地址", TextAlign:"center", MaxText:"擎擎擎擎擎" }
+            { Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID, Title:"链接地址", TextAlign:"center", MaxText:"擎擎擎擎擎" },
+
+            { Type:REPORT_COLUMN_ID.FUTURES_POSITION_ID, Title:"持仓量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Vol, Width:null, MaxText:"8888888" },
+            { Type:REPORT_COLUMN_ID.FUTURES_CLOSE_ID, Title:"结算价", TextAlign:"right", Width:null, MaxText:"8888888" },
+            { Type:REPORT_COLUMN_ID.FUTURES_YCLOSE_ID, Title:"昨结算价", TextAlign:"right", Width:null, MaxText:"8888888" },
+            { Type:REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID, Title:"开仓量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888888" },
+            { Type:REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID, Title:"平仓量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888888" },
+
+            { Type:REPORT_COLUMN_ID.RISING_SPEED_1M_ID, Title:"涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
+            { Type:REPORT_COLUMN_ID.RISING_SPEED_3M_ID, Title:"3分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
+            { Type:REPORT_COLUMN_ID.RISING_SPEED_5M_ID, Title:"5分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
+            { Type:REPORT_COLUMN_ID.RISING_SPEED_10M_ID, Title:"10分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
+            { Type:REPORT_COLUMN_ID.RISING_SPEED_15M_ID, Title:"15分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -132148,6 +132211,17 @@ function ChartReport()
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
+        else if (column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_ID || column.Type==REPORT_COLUMN_ID.FUTURES_YCLOSE_ID)
+        {
+            var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+            if (stock && IFrameSplitOperator.IsNumber(stock[fieldName]))
+            {
+                var value=stock[fieldName];
+                this.GetPriceDrawInfo(value, stock, data, drawInfo);
+            }
+
+            this.FormatDrawInfo(column, stock, drawInfo, data);
+        }
         else if (column.Type==REPORT_COLUMN_ID.SELL_PRICE_ID)
         {
             if (stock) this.GetPriceDrawInfo(stock.SellPrice, stock, data, drawInfo);
@@ -132217,7 +132291,9 @@ function ChartReport()
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
-        else if (column.Type==REPORT_COLUMN_ID.INCREASE_ID || column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID || column.Type==REPORT_COLUMN_ID.UPDOWN_ID)
+        else if (column.Type==REPORT_COLUMN_ID.INCREASE_ID || column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID || column.Type==REPORT_COLUMN_ID.UPDOWN_ID ||
+            column.Type==REPORT_COLUMN_ID.RISING_SPEED_1M_ID || column.Type==REPORT_COLUMN_ID.RISING_SPEED_3M_ID || column.Type==REPORT_COLUMN_ID.RISING_SPEED_5M_ID || 
+            column.Type==REPORT_COLUMN_ID.RISING_SPEED_10M_ID || column.Type==REPORT_COLUMN_ID.RISING_SPEED_15M_ID )
         {
             var fieldName=MAP_COLUMN_FIELD.get(column.Type);
             if (stock && IFrameSplitOperator.IsNumber(stock[fieldName]))
@@ -132229,6 +132305,18 @@ function ChartReport()
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
+        else if (column.Type==REPORT_COLUMN_ID.FUTURES_POSITION_ID || column.Type==REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID || column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID)
+        {
+            //持仓量原始值输出
+            var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+            if (stock && IFrameSplitOperator.IsNumber(stock[fieldName]))
+            {
+                var value=stock[fieldName];
+                drawInfo.Text=value.toFixed(0);
+            }
+
+            this.FormatDrawInfo(column, stock, drawInfo, data);
+        }
         else if (column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID)
         {
             this.GetCustomStringDrawInfo(data, column, drawInfo);
@@ -132751,10 +132839,21 @@ function ChartReport()
         if (!IFrameSplitOperator.IsNumber(price)) return false;
 
         drawInfo.Text=price.toFixed(data.Decimal);
-        if (!IFrameSplitOperator.IsNumber(stock.YClose))  
+
+        var yClose=null;
+        if (stock.PriceColorType===1)    //昨结算价 计算颜色
+        {
+            if (IFrameSplitOperator.IsNumber(stock.YFClose))  yClose=stock.YFClose;
+        }
+        else    //昨收价 计算颜色
+        {
+            if (IFrameSplitOperator.IsNumber(stock.YClose))  yClose=stock.YClose;
+        }
+
+        if (!IFrameSplitOperator.IsNumber(yClose))  
             drawInfo.TextColor=this.UnchagneColor;
         else  
-            drawInfo.TextColor=this.GetUpDownColor(price, stock.YClose);
+            drawInfo.TextColor=this.GetUpDownColor(price, yClose);
 
         if (option && option.LimitBG)
         {
@@ -140807,7 +140906,7 @@ function JSPopMenu()
             }
             else if (i==2)  //快捷方式
             {
-
+                if (item.Text) tdDom.innerText=item.Text;
             }
             else if (i==3)  //箭头
             {
@@ -142368,6 +142467,7 @@ function JSPopKeyboard()
     this.InputDOM=null;
     this.Title="HQChart 键盘精灵"
     this.ID=Guid();
+    this.ActiveDOM=null;    //启动键盘精灵是的控件
 
     this.Keyboard=
     {
@@ -142563,6 +142663,11 @@ function JSPopKeyboard()
         this.DivDialog.style.visibility='hidden';
         this.InputDOM.value="";
         this.Keyboard.JSChart.ClearSearch();
+        if (this.ActiveDOM)
+        {
+            if (this.ActiveDOM.focus) this.ActiveDOM.focus();   //把焦点换回去
+            this.ActiveDOM=null;
+        }
     }
 
     this.IsShow=function()
@@ -142580,6 +142685,7 @@ function JSPopKeyboard()
         {
             this.Show();
             this.InputDOM.focus();
+            if (event.target) this.ActiveDOM=event.target;
         }
         else if (code==27 && this.IsShow())
         {
@@ -142757,7 +142863,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13719";
+var HQCHART_VERSION="1.1.13727";
 
 function PrintHQChartVersion()
 {