hqchart 1.1.14915 → 1.1.14919

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14915",
+  "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.report.js

@@ -1146,6 +1146,8 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
@@ -1205,6 +1207,28 @@ function JSReportChartContainer(uielement)
 
         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();
     }
@@ -1518,7 +1542,7 @@ function JSReportChartContainer(uielement)
         if (!chart) return;
 
         //列表还没有加载完成
-        if (this.RequestStatus.IsFinishMemberList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
 
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {

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

@@ -138845,6 +138845,8 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
@@ -138904,6 +138906,28 @@ function JSReportChartContainer(uielement)
 
         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();
     }
@@ -139217,7 +139241,7 @@ function JSReportChartContainer(uielement)
         if (!chart) return;
 
         //列表还没有加载完成
-        if (this.RequestStatus.IsFinishMemberList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
 
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {
@@ -151104,7 +151128,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14914";
+var HQCHART_VERSION="1.1.14918";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -138889,6 +138889,8 @@ function JSReportChartContainer(uielement)
 
     this.RequestMemberListData=function()
     {
+        if (this.RequestStatus.IsFinishStockList==false) return;    //码表没有下完
+
         //this.ChartSplashPaint.SetTitle(this.SplashTitle.MemberList);
         //this.ChartSplashPaint.EnableSplash(true);
         //this.Draw();
@@ -138948,6 +138950,28 @@ function JSReportChartContainer(uielement)
 
         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();
     }
@@ -139261,7 +139285,7 @@ function JSReportChartContainer(uielement)
         if (!chart) return;
 
         //列表还没有加载完成
-        if (this.RequestStatus.IsFinishMemberList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
+        if (this.RequestStatus.IsFinishStockList==false ||  this.RequestStatus.IsFinishMemberList==false) return;
 
         if (this.Data.Virtual && this.Data.Virtual.Enable)
         {
@@ -158964,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=[];    //输出文字信息
@@ -159062,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;
@@ -159563,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;
@@ -162437,7 +162477,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14914";
+var HQCHART_VERSION="1.1.14918";
 
 function PrintHQChartVersion()
 {