hqchart 1.1.13957 → 1.1.13963

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13957",
+  "version": "1.1.13963",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -43162,6 +43162,7 @@ function MinuteLeftTooltipPaint()
     this.DateTimeColor=g_JSChartResource.PCTooltipPaint.DateTimeColor;      //日期时间颜色
     this.VolColor=g_JSChartResource.PCTooltipPaint.VolColor;          //标题成交量
     this.AmountColor=g_JSChartResource.PCTooltipPaint.AmountColor;    //成交金额
+    this.PositionColor=g_JSChartResource.PCTooltipPaint.PositionColor;  //持仓
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
     this.TitlePaint;
 
@@ -43335,6 +43336,12 @@ function MinuteLeftTooltipPaint()
 
                 aryText.push(titleItem);
             }
+
+            if (isFutures && IFrameSplitOperator.IsNumber(item.Position))   //持仓
+            {
+                var titleItem=this.FormatPosition(item.Position,'PCTooltip-Position');
+                if (titleItem) aryText.push(titleItem);
+            }
         }
         else if (drawData.Type==1)  //集合竞价
         {
@@ -43460,6 +43467,21 @@ function MinuteLeftTooltipPaint()
         
         return titleItem;
     }
+
+    this.FormatPosition=function(value, TitleID)
+    {
+        if (!IFrameSplitOperator.IsNumber(value)) return null;
+        
+        var titleItem=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            TitleColor:this.TitleColor,
+            Text:value.toFixed(0),
+            TextColor:this.PositionColor
+        };
+        
+        return titleItem;
+    }
 }
 
 //股票信息
@@ -69111,6 +69133,7 @@ function JSChartResource()
         DateTimeColor:'rgb(60,60,60)',
         VolColor:"rgb(60,60,60)",       //标题成交量
         AmountColor:"rgb(60,60,60)",    //成交金额
+        PositionColor:"rgb(60,60,60)",  //持仓量
     };
 
     this.PCTooltip= {
@@ -70117,6 +70140,8 @@ function JSChartResource()
             if (item.DateTimeColor) this.PCTooltipPaint.DateTimeColor=item.DateTimeColor;
             if (item.VolColor) this.PCTooltipPaint.VolColor=item.VolColor;
             if (item.AmountColor) this.PCTooltipPaint.AmountColor=item.AmountColor;
+            if (item.PositionColor) this.PCTooltipPaint.PositionColor=item.PositionColor;
+            
         }
 
         if (style.DialogTooltip)
@@ -71127,6 +71152,7 @@ function JSChartLocalization()
         ['PCTooltip-Increase', {CN:'涨幅', EN:'Increase:', TC:'漲幅'}],
         ['PCTooltip-Vol', {CN:'成交量', EN:'Volume:', TC:'成交量'}],
         ['PCTooltip-Amount', {CN:'成交额', EN:'Amount:', TC:'成交額'}],
+        ["PCTooltip-Position",{CN:'持仓量', EN:'Position:', TC:'持倉'}],
         ['PCTooltip-AC-Price', {CN:'匹配价:', EN:'Price:', TC:'匹配價'}],
         ['PCTooltip-AC-Increase', {CN:'竞价涨幅:', EN:'Increase:', TC:'競價漲幅'}],
         ['PCTooltip-AC-Vol', {CN:'匹配量:', EN:'V:', TC:'匹配量'}],

package/src/jscommon/umychart.report.js

@@ -1342,15 +1342,37 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
-        //更新的股票在当前页面,需要重绘
         var bUpdate=false;
-        var aryStock=chart.ShowSymbol;
-        for(var i=0;i<aryStock.length;++i)
+        //实时本地数据排序
+        var chart=this.ChartPaint[0];
+        if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
         {
-            if (setUpdateSymbol.has(aryStock[i].Symbol))
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+            if (event && event.Callback)
             {
-                bUpdate=true;
-                break;
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null };
+                event.Callback (event, sendData, this);
+                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+            }
+            else
+            {
+                this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+            }
+
+            bUpdate=true;   //排序暂时每次都刷新
+        }
+        else
+        {
+            //更新的股票在当前页面,需要重绘
+            var aryStock=chart.ShowSymbol;
+            for(var i=0;i<aryStock.length;++i)
+            {
+                if (setUpdateSymbol.has(aryStock[i].Symbol))
+                {
+                    bUpdate=true;
+                    break;
+                }
             }
         }
 
@@ -4511,7 +4533,7 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.VOL_ID, Title:"总量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Vol, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.AMOUNT_ID, Title:"总金额", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Amount, Width:null, MaxText:"8888.8擎" },
-            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88" },
+            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88擎" },
 
             { Type:REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID, Title:"流通股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.TOTAL_SHARES_ID, Title:"总股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },

package/src/jscommon/umychart.style.js

@@ -380,6 +380,7 @@ function GetBlackStyle()
             DateTimeColor:'rgb(210,210,210)',
             VolColor:"rgb(255, 185, 15)",       //标题成交量
             AmountColor:"rgb(210,210,210)",    //成交金额
+            PositionColor:"rgb(255,215,0)",  //持仓量
         },
 
         PCTooltipPaint:

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

@@ -47087,6 +47087,7 @@ function MinuteLeftTooltipPaint()
     this.DateTimeColor=g_JSChartResource.PCTooltipPaint.DateTimeColor;      //日期时间颜色
     this.VolColor=g_JSChartResource.PCTooltipPaint.VolColor;          //标题成交量
     this.AmountColor=g_JSChartResource.PCTooltipPaint.AmountColor;    //成交金额
+    this.PositionColor=g_JSChartResource.PCTooltipPaint.PositionColor;  //持仓
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
     this.TitlePaint;
 
@@ -47260,6 +47261,12 @@ function MinuteLeftTooltipPaint()
 
                 aryText.push(titleItem);
             }
+
+            if (isFutures && IFrameSplitOperator.IsNumber(item.Position))   //持仓
+            {
+                var titleItem=this.FormatPosition(item.Position,'PCTooltip-Position');
+                if (titleItem) aryText.push(titleItem);
+            }
         }
         else if (drawData.Type==1)  //集合竞价
         {
@@ -47385,6 +47392,21 @@ function MinuteLeftTooltipPaint()
         
         return titleItem;
     }
+
+    this.FormatPosition=function(value, TitleID)
+    {
+        if (!IFrameSplitOperator.IsNumber(value)) return null;
+        
+        var titleItem=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            TitleColor:this.TitleColor,
+            Text:value.toFixed(0),
+            TextColor:this.PositionColor
+        };
+        
+        return titleItem;
+    }
 }
 
 //股票信息
@@ -73036,6 +73058,7 @@ function JSChartResource()
         DateTimeColor:'rgb(60,60,60)',
         VolColor:"rgb(60,60,60)",       //标题成交量
         AmountColor:"rgb(60,60,60)",    //成交金额
+        PositionColor:"rgb(60,60,60)",  //持仓量
     };
 
     this.PCTooltip= {
@@ -74042,6 +74065,8 @@ function JSChartResource()
             if (item.DateTimeColor) this.PCTooltipPaint.DateTimeColor=item.DateTimeColor;
             if (item.VolColor) this.PCTooltipPaint.VolColor=item.VolColor;
             if (item.AmountColor) this.PCTooltipPaint.AmountColor=item.AmountColor;
+            if (item.PositionColor) this.PCTooltipPaint.PositionColor=item.PositionColor;
+            
         }
 
         if (style.DialogTooltip)
@@ -75052,6 +75077,7 @@ function JSChartLocalization()
         ['PCTooltip-Increase', {CN:'涨幅', EN:'Increase:', TC:'漲幅'}],
         ['PCTooltip-Vol', {CN:'成交量', EN:'Volume:', TC:'成交量'}],
         ['PCTooltip-Amount', {CN:'成交额', EN:'Amount:', TC:'成交額'}],
+        ["PCTooltip-Position",{CN:'持仓量', EN:'Position:', TC:'持倉'}],
         ['PCTooltip-AC-Price', {CN:'匹配价:', EN:'Price:', TC:'匹配價'}],
         ['PCTooltip-AC-Increase', {CN:'竞价涨幅:', EN:'Increase:', TC:'競價漲幅'}],
         ['PCTooltip-AC-Vol', {CN:'匹配量:', EN:'V:', TC:'匹配量'}],
@@ -125548,6 +125574,7 @@ function GetBlackStyle()
             DateTimeColor:'rgb(210,210,210)',
             VolColor:"rgb(255, 185, 15)",       //标题成交量
             AmountColor:"rgb(210,210,210)",    //成交金额
+            PositionColor:"rgb(255,215,0)",  //持仓量
         },
 
         PCTooltipPaint:
@@ -128773,15 +128800,37 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
-        //更新的股票在当前页面,需要重绘
         var bUpdate=false;
-        var aryStock=chart.ShowSymbol;
-        for(var i=0;i<aryStock.length;++i)
+        //实时本地数据排序
+        var chart=this.ChartPaint[0];
+        if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
         {
-            if (setUpdateSymbol.has(aryStock[i].Symbol))
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+            if (event && event.Callback)
             {
-                bUpdate=true;
-                break;
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null };
+                event.Callback (event, sendData, this);
+                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+            }
+            else
+            {
+                this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+            }
+
+            bUpdate=true;   //排序暂时每次都刷新
+        }
+        else
+        {
+            //更新的股票在当前页面,需要重绘
+            var aryStock=chart.ShowSymbol;
+            for(var i=0;i<aryStock.length;++i)
+            {
+                if (setUpdateSymbol.has(aryStock[i].Symbol))
+                {
+                    bUpdate=true;
+                    break;
+                }
             }
         }
 
@@ -131942,7 +131991,7 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.VOL_ID, Title:"总量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Vol, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.AMOUNT_ID, Title:"总金额", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Amount, Width:null, MaxText:"8888.8擎" },
-            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88" },
+            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88擎" },
 
             { Type:REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID, Title:"流通股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.TOTAL_SHARES_ID, Title:"总股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },
@@ -139128,7 +139177,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13956";
+var HQCHART_VERSION="1.1.13962";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -47131,6 +47131,7 @@ function MinuteLeftTooltipPaint()
     this.DateTimeColor=g_JSChartResource.PCTooltipPaint.DateTimeColor;      //日期时间颜色
     this.VolColor=g_JSChartResource.PCTooltipPaint.VolColor;          //标题成交量
     this.AmountColor=g_JSChartResource.PCTooltipPaint.AmountColor;    //成交金额
+    this.PositionColor=g_JSChartResource.PCTooltipPaint.PositionColor;  //持仓
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
     this.TitlePaint;
 
@@ -47304,6 +47305,12 @@ function MinuteLeftTooltipPaint()
 
                 aryText.push(titleItem);
             }
+
+            if (isFutures && IFrameSplitOperator.IsNumber(item.Position))   //持仓
+            {
+                var titleItem=this.FormatPosition(item.Position,'PCTooltip-Position');
+                if (titleItem) aryText.push(titleItem);
+            }
         }
         else if (drawData.Type==1)  //集合竞价
         {
@@ -47429,6 +47436,21 @@ function MinuteLeftTooltipPaint()
         
         return titleItem;
     }
+
+    this.FormatPosition=function(value, TitleID)
+    {
+        if (!IFrameSplitOperator.IsNumber(value)) return null;
+        
+        var titleItem=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            TitleColor:this.TitleColor,
+            Text:value.toFixed(0),
+            TextColor:this.PositionColor
+        };
+        
+        return titleItem;
+    }
 }
 
 //股票信息
@@ -73080,6 +73102,7 @@ function JSChartResource()
         DateTimeColor:'rgb(60,60,60)',
         VolColor:"rgb(60,60,60)",       //标题成交量
         AmountColor:"rgb(60,60,60)",    //成交金额
+        PositionColor:"rgb(60,60,60)",  //持仓量
     };
 
     this.PCTooltip= {
@@ -74086,6 +74109,8 @@ function JSChartResource()
             if (item.DateTimeColor) this.PCTooltipPaint.DateTimeColor=item.DateTimeColor;
             if (item.VolColor) this.PCTooltipPaint.VolColor=item.VolColor;
             if (item.AmountColor) this.PCTooltipPaint.AmountColor=item.AmountColor;
+            if (item.PositionColor) this.PCTooltipPaint.PositionColor=item.PositionColor;
+            
         }
 
         if (style.DialogTooltip)
@@ -75096,6 +75121,7 @@ function JSChartLocalization()
         ['PCTooltip-Increase', {CN:'涨幅', EN:'Increase:', TC:'漲幅'}],
         ['PCTooltip-Vol', {CN:'成交量', EN:'Volume:', TC:'成交量'}],
         ['PCTooltip-Amount', {CN:'成交额', EN:'Amount:', TC:'成交額'}],
+        ["PCTooltip-Position",{CN:'持仓量', EN:'Position:', TC:'持倉'}],
         ['PCTooltip-AC-Price', {CN:'匹配价:', EN:'Price:', TC:'匹配價'}],
         ['PCTooltip-AC-Increase', {CN:'竞价涨幅:', EN:'Increase:', TC:'競價漲幅'}],
         ['PCTooltip-AC-Vol', {CN:'匹配量:', EN:'V:', TC:'匹配量'}],
@@ -125592,6 +125618,7 @@ function GetBlackStyle()
             DateTimeColor:'rgb(210,210,210)',
             VolColor:"rgb(255, 185, 15)",       //标题成交量
             AmountColor:"rgb(210,210,210)",    //成交金额
+            PositionColor:"rgb(255,215,0)",  //持仓量
         },
 
         PCTooltipPaint:
@@ -128817,15 +128844,37 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
-        //更新的股票在当前页面,需要重绘
         var bUpdate=false;
-        var aryStock=chart.ShowSymbol;
-        for(var i=0;i<aryStock.length;++i)
+        //实时本地数据排序
+        var chart=this.ChartPaint[0];
+        if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
         {
-            if (setUpdateSymbol.has(aryStock[i].Symbol))
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+            if (event && event.Callback)
             {
-                bUpdate=true;
-                break;
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null };
+                event.Callback (event, sendData, this);
+                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+            }
+            else
+            {
+                this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+            }
+
+            bUpdate=true;   //排序暂时每次都刷新
+        }
+        else
+        {
+            //更新的股票在当前页面,需要重绘
+            var aryStock=chart.ShowSymbol;
+            for(var i=0;i<aryStock.length;++i)
+            {
+                if (setUpdateSymbol.has(aryStock[i].Symbol))
+                {
+                    bUpdate=true;
+                    break;
+                }
             }
         }
 
@@ -131986,7 +132035,7 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.VOL_ID, Title:"总量", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Vol, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.AMOUNT_ID, Title:"总金额", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Amount, Width:null, MaxText:"8888.8擎" },
-            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88" },
+            { Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID, Title:"换手%", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"88.88擎" },
 
             { Type:REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID, Title:"流通股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },
             { Type:REPORT_COLUMN_ID.TOTAL_SHARES_ID, Title:"总股本", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, Width:null, MaxText:"8888.8擎" },
@@ -144533,7 +144582,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13956";
+var HQCHART_VERSION="1.1.13962";
 
 function PrintHQChartVersion()
 {