hqchart 1.1.14912 → 1.1.14919

package/package.json

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

package/src/jscommon/umychart.DialogTooltip.js

@@ -1125,6 +1125,13 @@ function JSFloatTooltip()
         Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
         MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
         Right:"UMyChart_Tooltip_Float_Text_Span",
+
+        
+    }
+
+    this.TitleAlign=
+    {
+        Default:"UMyChart_Tooltip_Float_Title_Span",   //标题默认
     }
 
     this.AryData=[];    //输出文字信息
@@ -1223,7 +1230,7 @@ function JSFloatTooltip()
             rowItem.TitleTd=tdDom;
 
             var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Float_Title_Span';
+            spanDom.className=this.TitleAlign.Default;
             spanDom.innerText='标题';
             tdDom.appendChild(spanDom);
             rowItem.TitleSpan=spanDom;
@@ -1724,6 +1731,15 @@ function JSFloatTooltip()
                 if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
             }
 
+            if (outItem.TitleClassName)
+            {
+                item.TitleSpan.className=outItem.TitleClassName;
+            }
+            else
+            {
+                if (item.TitleSpan.className!=this.TitleAlign.Default) item.TitleSpan.className=this.TitleAlign.Default;
+            }
+
             if (outItem.IsMergeCell)    //合并单元格
             {
                 item.TitleTd.colspan=2;

package/src/jscommon/umychart.js

@@ -61867,7 +61867,7 @@ function DynamicChartTitlePainting()
     this.FormatValue=function(value,item)
     {
         if (item.StringFormat==STRING_FORMAT_TYPE.DEFAULT)
-            return IFrameSplitOperator.FormatValueString(value,item.FloatPrecision,this.LanguageID);
+            return IFrameSplitOperator.FormatValueStringV2(value,item.FloatPrecision,2,this.LanguageID);
         else if (item.StringFormat==STRING_FORMAT_TYPE.THOUSANDS)
             return IFrameSplitOperator.FormatValueThousandsString(value,item.FloatPrecision);
         else if (item.StringFormat==STRING_FORMAT_TYPE.ORIGINAL) 

package/src/jscommon/umychart.report.js

@@ -494,6 +494,7 @@ function JSReportChartContainer(uielement)
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+    this.RequestStatus={ IsFinishStockList:false, IsFinishMemberList:false };       //下载状态  
    
     this.ChartDestroy=function()    //销毁
     {
@@ -1032,6 +1033,8 @@ function JSReportChartContainer(uielement)
                 var requestOption={ Callback:null };
                 if (this.Symbol) requestOption.Callback=()=>{ this.RequestMemberListData(); };
                 this.MapStockData=new Map();
+                this.RequestStatus.IsFinishStockList=false;
+                this.RequestStatus.IsFinishMemberList=false;
                 this.RequestStockListData(requestOption);
                 return;
             }
@@ -1143,10 +1146,12 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
-
+        this.RequestStatus.IsFinishMemberList=false;
         var self=this;
         if (this.NetworkFilter)
         {
@@ -1200,6 +1205,30 @@ function JSReportChartContainer(uielement)
             if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
         }
 
+        this.RequestStatus.IsFinishMemberList=true;
+
+        //实时本地数据排序
+        var chart=this.GetReportChart();
+        if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
+        {
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+
+            var bLocalSrot=true;
+            if (event && event.Callback)
+            {
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false };
+                event.Callback (event, sendData, this);
+                if (event.PreventDefault)
+                {
+                    bLocalSrot=false;
+                    if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                }
+            }
+            
+            if (bLocalSrot) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -1311,6 +1340,7 @@ function JSReportChartContainer(uielement)
     //下载码表
     this.RequestStockListData=function(option)
     {
+        this.RequestStatus.IsFinishStockList=false;
         this.ChartSplashPaint.SetTitle(this.SplashTitle.StockList);
         this.ChartSplashPaint.EnableSplash(true);
         this.Draw();
@@ -1366,6 +1396,8 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        this.RequestStatus.IsFinishStockList=true;
+
         if (option && option.Callback)
         {
             option.Callback();
@@ -1509,6 +1541,9 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        //列表还没有加载完成
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {
             this.RequestVirtualStockData(); //虚拟表格 全部取后台

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

@@ -65963,7 +65963,7 @@ function DynamicChartTitlePainting()
     this.FormatValue=function(value,item)
     {
         if (item.StringFormat==STRING_FORMAT_TYPE.DEFAULT)
-            return IFrameSplitOperator.FormatValueString(value,item.FloatPrecision,this.LanguageID);
+            return IFrameSplitOperator.FormatValueStringV2(value,item.FloatPrecision,2,this.LanguageID);
         else if (item.StringFormat==STRING_FORMAT_TYPE.THOUSANDS)
             return IFrameSplitOperator.FormatValueThousandsString(value,item.FloatPrecision);
         else if (item.StringFormat==STRING_FORMAT_TYPE.ORIGINAL) 
@@ -138193,6 +138193,7 @@ function JSReportChartContainer(uielement)
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+    this.RequestStatus={ IsFinishStockList:false, IsFinishMemberList:false };       //下载状态  
    
     this.ChartDestroy=function()    //销毁
     {
@@ -138731,6 +138732,8 @@ function JSReportChartContainer(uielement)
                 var requestOption={ Callback:null };
                 if (this.Symbol) requestOption.Callback=()=>{ this.RequestMemberListData(); };
                 this.MapStockData=new Map();
+                this.RequestStatus.IsFinishStockList=false;
+                this.RequestStatus.IsFinishMemberList=false;
                 this.RequestStockListData(requestOption);
                 return;
             }
@@ -138842,10 +138845,12 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
-
+        this.RequestStatus.IsFinishMemberList=false;
         var self=this;
         if (this.NetworkFilter)
         {
@@ -138899,6 +138904,30 @@ function JSReportChartContainer(uielement)
             if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
         }
 
+        this.RequestStatus.IsFinishMemberList=true;
+
+        //实时本地数据排序
+        var chart=this.GetReportChart();
+        if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
+        {
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+
+            var bLocalSrot=true;
+            if (event && event.Callback)
+            {
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false };
+                event.Callback (event, sendData, this);
+                if (event.PreventDefault)
+                {
+                    bLocalSrot=false;
+                    if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                }
+            }
+            
+            if (bLocalSrot) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -139010,6 +139039,7 @@ function JSReportChartContainer(uielement)
     //下载码表
     this.RequestStockListData=function(option)
     {
+        this.RequestStatus.IsFinishStockList=false;
         this.ChartSplashPaint.SetTitle(this.SplashTitle.StockList);
         this.ChartSplashPaint.EnableSplash(true);
         this.Draw();
@@ -139065,6 +139095,8 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        this.RequestStatus.IsFinishStockList=true;
+
         if (option && option.Callback)
         {
             option.Callback();
@@ -139208,6 +139240,9 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        //列表还没有加载完成
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {
             this.RequestVirtualStockData(); //虚拟表格 全部取后台
@@ -151093,7 +151128,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14911";
+var HQCHART_VERSION="1.1.14918";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -66007,7 +66007,7 @@ function DynamicChartTitlePainting()
     this.FormatValue=function(value,item)
     {
         if (item.StringFormat==STRING_FORMAT_TYPE.DEFAULT)
-            return IFrameSplitOperator.FormatValueString(value,item.FloatPrecision,this.LanguageID);
+            return IFrameSplitOperator.FormatValueStringV2(value,item.FloatPrecision,2,this.LanguageID);
         else if (item.StringFormat==STRING_FORMAT_TYPE.THOUSANDS)
             return IFrameSplitOperator.FormatValueThousandsString(value,item.FloatPrecision);
         else if (item.StringFormat==STRING_FORMAT_TYPE.ORIGINAL) 
@@ -138237,6 +138237,7 @@ function JSReportChartContainer(uielement)
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+    this.RequestStatus={ IsFinishStockList:false, IsFinishMemberList:false };       //下载状态  
    
     this.ChartDestroy=function()    //销毁
     {
@@ -138775,6 +138776,8 @@ function JSReportChartContainer(uielement)
                 var requestOption={ Callback:null };
                 if (this.Symbol) requestOption.Callback=()=>{ this.RequestMemberListData(); };
                 this.MapStockData=new Map();
+                this.RequestStatus.IsFinishStockList=false;
+                this.RequestStatus.IsFinishMemberList=false;
                 this.RequestStockListData(requestOption);
                 return;
             }
@@ -138886,10 +138889,12 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
-
+        this.RequestStatus.IsFinishMemberList=false;
         var self=this;
         if (this.NetworkFilter)
         {
@@ -138943,6 +138948,30 @@ function JSReportChartContainer(uielement)
             if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
         }
 
+        this.RequestStatus.IsFinishMemberList=true;
+
+        //实时本地数据排序
+        var chart=this.GetReportChart();
+        if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
+        {
+            var column=chart.Column[this.SortInfo.Field];
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+
+            var bLocalSrot=true;
+            if (event && event.Callback)
+            {
+                var sendData={ Column:column, SortInfo:this.SortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false };
+                event.Callback (event, sendData, this);
+                if (event.PreventDefault)
+                {
+                    bLocalSrot=false;
+                    if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                }
+            }
+            
+            if (bLocalSrot) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, this.SortInfo.Sort); });
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -139054,6 +139083,7 @@ function JSReportChartContainer(uielement)
     //下载码表
     this.RequestStockListData=function(option)
     {
+        this.RequestStatus.IsFinishStockList=false;
         this.ChartSplashPaint.SetTitle(this.SplashTitle.StockList);
         this.ChartSplashPaint.EnableSplash(true);
         this.Draw();
@@ -139109,6 +139139,8 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        this.RequestStatus.IsFinishStockList=true;
+
         if (option && option.Callback)
         {
             option.Callback();
@@ -139252,6 +139284,9 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        //列表还没有加载完成
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {
             this.RequestVirtualStockData(); //虚拟表格 全部取后台
@@ -158953,6 +158988,13 @@ function JSFloatTooltip()
         Left:"UMyChart_Tooltip_Float_Text2_Span",       //左对齐
         MarginLeft:'UMyChart_Tooltip_Float_Text3_Span',
         Right:"UMyChart_Tooltip_Float_Text_Span",
+
+        
+    }
+
+    this.TitleAlign=
+    {
+        Default:"UMyChart_Tooltip_Float_Title_Span",   //标题默认
     }
 
     this.AryData=[];    //输出文字信息
@@ -159051,7 +159093,7 @@ function JSFloatTooltip()
             rowItem.TitleTd=tdDom;
 
             var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Float_Title_Span';
+            spanDom.className=this.TitleAlign.Default;
             spanDom.innerText='标题';
             tdDom.appendChild(spanDom);
             rowItem.TitleSpan=spanDom;
@@ -159552,6 +159594,15 @@ function JSFloatTooltip()
                 if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
             }
 
+            if (outItem.TitleClassName)
+            {
+                item.TitleSpan.className=outItem.TitleClassName;
+            }
+            else
+            {
+                if (item.TitleSpan.className!=this.TitleAlign.Default) item.TitleSpan.className=this.TitleAlign.Default;
+            }
+
             if (outItem.IsMergeCell)    //合并单元格
             {
                 item.TitleTd.colspan=2;
@@ -162426,7 +162477,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14911";
+var HQCHART_VERSION="1.1.14918";
 
 function PrintHQChartVersion()
 {