hqchart 1.1.14915 → 1.1.14922

package/package.json

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

@@ -2829,6 +2829,8 @@ var JSCHART_EVENT_ID=
     GET_DEFAULT_INDEX_PARAM:172,                //获取指标默认参数
 
     ON_RELOAD_RESOURCE:173,
+
+    ON_REPORT_DATA_FILTER:174,                  //数据筛选
 }
 
 var JSCHART_OPERATOR_ID=

package/src/jscommon/umychart.report.js

@@ -229,7 +229,13 @@ function JSReportChart(divElement)
         //是否自动更新
         if (option.IsAutoUpdate!=null) chart.IsAutoUpdate=option.IsAutoUpdate;
         if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
-        if (IFrameSplitOperator.IsBool(option.EnableFilter)) chart.EnableFilter=option.EnableFilter;
+
+        //数据筛选
+        if (option.DataFilter)
+        {
+            var item=option.DataFilter;
+            if (IFrameSplitOperator.IsBool(item.Enable)) chart.DataFilterConfig.Enable=item.Enable;
+        }
 
         //注册事件
         if (option.EventCallback)
@@ -303,9 +309,9 @@ function JSReportChart(divElement)
         if (this.JSChartContainer) this.JSChartContainer.AddSymbol(arySymbol, option);
     }
 
-    this.EnableFilter=function(bEnable, option) //启动|关闭筛选
+    this.EnableDataFilter=function(bEnable, option) //启动|关闭筛选
     {
-        if (this.JSChartContainer) this.JSChartContainer.EnableFilter(bEnable, option);
+        if (this.JSChartContainer) this.JSChartContainer.EnableDataFilter(bEnable, option);
     }
 
     //事件回调
@@ -495,6 +501,8 @@ function JSReportChartContainer(uielement)
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
     this.RequestStatus={ IsFinishStockList:false, IsFinishMemberList:false };       //下载状态  
+
+    this.DataFilterConfig={ Enable:false, };      //数据筛选
    
     this.ChartDestroy=function()    //销毁
     {
@@ -1146,6 +1154,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 +1215,16 @@ function JSReportChartContainer(uielement)
 
         this.RequestStatus.IsFinishMemberList=true;
 
+        this.DataFilter();
+
+        //实时本地数据排序
+        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];
+            this.LocalDataSort(column, this.SortInfo);
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -1518,7 +1538,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)
         {
@@ -1616,31 +1636,21 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        
+
         var bUpdate=false;
+        if (this.DataFilter()) bUpdate=true;    //过滤数据每次都刷新
+
         //实时本地数据排序
         var chart=this.ChartPaint[0];
         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 selectedSymbol=null;
             if (chart.SelectedRowData && chart.SelectedModel==1) selectedSymbol=chart.SelectedRowData.Symbol;
 
-            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); });
+            var column=chart.Column[this.SortInfo.Field];
+            this.LocalDataSort(column, this.SortInfo);
 
             if (selectedSymbol) 
             {
@@ -3705,33 +3715,15 @@ function JSReportChartContainer(uielement)
             {
                 if (sortInfo.Sort==0)
                 {
-                    this.Data.Data=[];
-                    for(var i=0;i<this.SourceData.Data.length;++i)
-                    {
-                        this.Data.Data.push(this.SourceData.Data[i]);
-                    }
+                    this.Data.Data=this.SourceData.Data.slice();
+                    this.DataFilter();
                 } 
                 else
                 {
                     if (header.Column.Sort==1)  //本地排序
                     {
-                        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
-                        var bLocalSort=true;
-                        if (event && event.Callback)
-                        {
-                            var sendData={ Column:header.Column, SortInfo:sortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false};
-                            event.Callback (event, sendData, this);
-                            if (sendData.PreventDefault)
-                            {
-                                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
-                                bLocalSort=false;
-                            }
-                            
-                        }
-                        
-                        
-                        if (bLocalSort) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, header.Column, sortInfo.Sort); });
-                        
+                        this.DataFilter();
+                        this.LocalDataSort(header.Column, sortInfo);
                     }
                     else if (header.Column.Sort==2) //远程排序
                     {
@@ -3756,6 +3748,70 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.LocalDataSort=function(column, sortInfo)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+        var bLocalSort=true;
+        if (event && event.Callback)
+        {
+            var sendData={ Column:header.Column, SortInfo:sortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false};
+            event.Callback (event, sendData, this);
+            if (sendData.PreventDefault)
+            {
+                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                bLocalSort=false;
+            }
+        }
+        
+        if (bLocalSort) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, sortInfo.Sort); });
+    }
+
+    //数据筛选
+    this.DataFilter=function()
+    {
+        if (!this.DataFilterConfig.Enable) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)) return false;
+        
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DATA_FILTER);
+        if (!event || !event.Callback) return false;
+
+        var aryData=this.SourceData.Data.slice();   //原始数据
+
+        var sendData={ AryData:aryData, PreventDefault:false };
+        event.Callback(event, sendData, this);
+        if (!sendData.PreventDefault) return false;
+
+        this.Data.Data=sendData.AryData;
+
+        return true;
+    }
+
+    this.EnableDataFilter=function(enable, option)
+    {
+        if (!IFrameSplitOperator.IsBool(enable)) return false;
+
+        this.DataFilterConfig.Enable=enable;
+        if (enable)
+        {
+            this.DataFilter();
+        }
+        else
+        {
+            this.Data.Data=this.SourceData.Data.slice();
+        }
+
+        //排序
+        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];
+            this.LocalDataSort(column, this.SortInfo);
+        }
+
+        this.ResetReportStatus();
+        this.Draw();
+    }
+
     this.PopupHeaderMenu=function(clickData, e)
     {
         if (!this.JSPopMenu) return;

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

@@ -6925,6 +6925,8 @@ var JSCHART_EVENT_ID=
     GET_DEFAULT_INDEX_PARAM:172,                //获取指标默认参数
 
     ON_RELOAD_RESOURCE:173,
+
+    ON_REPORT_DATA_FILTER:174,                  //数据筛选
 }
 
 var JSCHART_OPERATOR_ID=
@@ -137928,7 +137930,13 @@ function JSReportChart(divElement)
         //是否自动更新
         if (option.IsAutoUpdate!=null) chart.IsAutoUpdate=option.IsAutoUpdate;
         if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
-        if (IFrameSplitOperator.IsBool(option.EnableFilter)) chart.EnableFilter=option.EnableFilter;
+
+        //数据筛选
+        if (option.DataFilter)
+        {
+            var item=option.DataFilter;
+            if (IFrameSplitOperator.IsBool(item.Enable)) chart.DataFilterConfig.Enable=item.Enable;
+        }
 
         //注册事件
         if (option.EventCallback)
@@ -138002,9 +138010,9 @@ function JSReportChart(divElement)
         if (this.JSChartContainer) this.JSChartContainer.AddSymbol(arySymbol, option);
     }
 
-    this.EnableFilter=function(bEnable, option) //启动|关闭筛选
+    this.EnableDataFilter=function(bEnable, option) //启动|关闭筛选
     {
-        if (this.JSChartContainer) this.JSChartContainer.EnableFilter(bEnable, option);
+        if (this.JSChartContainer) this.JSChartContainer.EnableDataFilter(bEnable, option);
     }
 
     //事件回调
@@ -138194,6 +138202,8 @@ function JSReportChartContainer(uielement)
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
     this.RequestStatus={ IsFinishStockList:false, IsFinishMemberList:false };       //下载状态  
+
+    this.DataFilterConfig={ Enable:false, };      //数据筛选
    
     this.ChartDestroy=function()    //销毁
     {
@@ -138845,6 +138855,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 +138916,16 @@ function JSReportChartContainer(uielement)
 
         this.RequestStatus.IsFinishMemberList=true;
 
+        this.DataFilter();
+
+        //实时本地数据排序
+        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];
+            this.LocalDataSort(column, this.SortInfo);
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -139217,7 +139239,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)
         {
@@ -139315,31 +139337,21 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        
+
         var bUpdate=false;
+        if (this.DataFilter()) bUpdate=true;    //过滤数据每次都刷新
+
         //实时本地数据排序
         var chart=this.ChartPaint[0];
         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 selectedSymbol=null;
             if (chart.SelectedRowData && chart.SelectedModel==1) selectedSymbol=chart.SelectedRowData.Symbol;
 
-            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); });
+            var column=chart.Column[this.SortInfo.Field];
+            this.LocalDataSort(column, this.SortInfo);
 
             if (selectedSymbol) 
             {
@@ -141404,33 +141416,15 @@ function JSReportChartContainer(uielement)
             {
                 if (sortInfo.Sort==0)
                 {
-                    this.Data.Data=[];
-                    for(var i=0;i<this.SourceData.Data.length;++i)
-                    {
-                        this.Data.Data.push(this.SourceData.Data[i]);
-                    }
+                    this.Data.Data=this.SourceData.Data.slice();
+                    this.DataFilter();
                 } 
                 else
                 {
                     if (header.Column.Sort==1)  //本地排序
                     {
-                        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
-                        var bLocalSort=true;
-                        if (event && event.Callback)
-                        {
-                            var sendData={ Column:header.Column, SortInfo:sortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false};
-                            event.Callback (event, sendData, this);
-                            if (sendData.PreventDefault)
-                            {
-                                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
-                                bLocalSort=false;
-                            }
-                            
-                        }
-                        
-                        
-                        if (bLocalSort) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, header.Column, sortInfo.Sort); });
-                        
+                        this.DataFilter();
+                        this.LocalDataSort(header.Column, sortInfo);
                     }
                     else if (header.Column.Sort==2) //远程排序
                     {
@@ -141455,6 +141449,70 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.LocalDataSort=function(column, sortInfo)
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
+        var bLocalSort=true;
+        if (event && event.Callback)
+        {
+            var sendData={ Column:header.Column, SortInfo:sortInfo, SymbolList:this.Data.Data, Result:null, PreventDefault:false};
+            event.Callback (event, sendData, this);
+            if (sendData.PreventDefault)
+            {
+                if (Array.isArray(sendData.Result)) this.Data.Data=sendData.Result;
+                bLocalSort=false;
+            }
+        }
+        
+        if (bLocalSort) this.Data.Data.sort((left, right)=> { return this.LocalSort(left, right, column, sortInfo.Sort); });
+    }
+
+    //数据筛选
+    this.DataFilter=function()
+    {
+        if (!this.DataFilterConfig.Enable) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)) return false;
+        
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DATA_FILTER);
+        if (!event || !event.Callback) return false;
+
+        var aryData=this.SourceData.Data.slice();   //原始数据
+
+        var sendData={ AryData:aryData, PreventDefault:false };
+        event.Callback(event, sendData, this);
+        if (!sendData.PreventDefault) return false;
+
+        this.Data.Data=sendData.AryData;
+
+        return true;
+    }
+
+    this.EnableDataFilter=function(enable, option)
+    {
+        if (!IFrameSplitOperator.IsBool(enable)) return false;
+
+        this.DataFilterConfig.Enable=enable;
+        if (enable)
+        {
+            this.DataFilter();
+        }
+        else
+        {
+            this.Data.Data=this.SourceData.Data.slice();
+        }
+
+        //排序
+        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];
+            this.LocalDataSort(column, this.SortInfo);
+        }
+
+        this.ResetReportStatus();
+        this.Draw();
+    }
+
     this.PopupHeaderMenu=function(clickData, e)
     {
         if (!this.JSPopMenu) return;
@@ -151104,7 +151162,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14914";
+var HQCHART_VERSION="1.1.14921";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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