hqchart 1.1.14216 → 1.1.14223

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

@@ -6763,18 +6763,19 @@ var JSCHART_MENU_ID=
     CMD_CHANGE_INFO_POSITION_ID:41,     //修改信息地雷位置
     CMD_CHIP_CHART_SETTING_ID:42,       //筹码图设置
 
+    CMD_DIALOG_TOOLTIP_ATTRIBUTE:43,    //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
+    CMD_KLINE_TOOLTIP_ATTRIBUTE:44,     //修改K线提示框属性 Ary:[{ Enable:true/false, EnableKeyDown:true/false}]
 
-    CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
-    CMD_REPORT_COLUMN_SORT_ID:61,       //报价列表 表头排序  Arg[列序号, 排序方向]
-    CMD_REPORT_COLUMN_DEL_ID:62,        //报价列表 删除列
-    CMD_REPORT_COLUMN_MOVE_ID:63,       //报价列表 列移动
-    CMD_REPORT_COLUMN_FILTER_ID:64,     //报价列表 筛选
+    CMD_MODIFY_INDEX_PARAM:45,          //指标删除修改  [windowIndex, ]
+    CMD_MODIFY_OVERLAY_INDEX_PARAM:46,  //叠加指标修改  [windowIndex, ID ]
 
-    CMD_DIALOG_TOOLTIP_ATTRIBUTE:65,    //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
-    CMD_KLINE_TOOLTIP_ATTRIBUTE:66,     //修改K线提示框属性 Ary:[{ Enable:true/false, EnableKeyDown:true/false}]
 
-    CMD_MODIFY_INDEX_PARAM:67,          //指标删除修改  [windowIndex, ]
-    CMD_MODIFY_OVERLAY_INDEX_PARAM:68,  //叠加指标修改  [windowIndex, ID ]
+    CMD_REPORT_CHANGE_BLOCK_ID:100,      //报价列表 切换板块ID
+    CMD_REPORT_COLUMN_SORT_ID:101,       //报价列表 表头排序  Arg[列序号, 排序方向]
+    CMD_REPORT_COLUMN_DEL_ID:102,        //报价列表 删除列
+    CMD_REPORT_COLUMN_MOVE_ID:103,       //报价列表 列移动
+    CMD_REPORT_COLUMN_FILTER_ID:104,     //报价列表 筛选
+    CMD_REPORT_CHANGE_COLUMN_ID:105,     //报价列表 切换列  Arg[Column, ]
 }
 
 
@@ -12778,6 +12779,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.Change)) frame.ChangeIndex=windowItem.Change;
             if (IFrameSplitOperator.IsBool(windowItem.Close)) frame.CloseIndex=windowItem.Close;
             if (IFrameSplitOperator.IsBool(windowItem.Overlay)) frame.OverlayIndex=windowItem.Overlay;
+            if (IFrameSplitOperator.IsBool(windowItem.AddIndexWindow)) frame.AddIndexWindow=windowItem.AddIndexWindow;
+
             if (IFrameSplitOperator.IsBool(windowItem.IsDrawTitleBG))  frame.IsDrawTitleBG=windowItem.IsDrawTitleBG;
 
             if (IFrameSplitOperator.IsNumber(windowItem.TitleHeight)) frame.ChartBorder.TitleHeight=windowItem.TitleHeight;
@@ -12836,6 +12839,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(item.Export)) frame.ExportData=item.Export;
             if (IFrameSplitOperator.IsBool(item.MaxMin)) frame.MaxMinWindow=item.MaxMin;
             if (IFrameSplitOperator.IsBool(item.TitleWindow)) frame.TitleWindow=item.TitleWindow;
+            if (IFrameSplitOperator.IsBool(item.AddIndexWindow)) frame.AddIndexWindow=item.AddIndexWindow;
 
             if (IFrameSplitOperator.IsBool(item.IsDrawTitleBG))  frame.IsDrawTitleBG=item.IsDrawTitleBG;
             if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) frame.IsShowNameArrow=item.IsShowNameArrow;
@@ -51285,7 +51289,7 @@ function SessionBreaksPaint()
     this.Draw=function()
     {
         if (!this.HQChart) return;
-        var hisData=this.HQChart.ChartOperator_Temp_GetHistroyData();;
+        var hisData=this.HQChart.ChartOperator_Temp_GetHistoryData();;
         if (!hisData) return;  //数据还没有到达
         if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return;
 
@@ -77271,7 +77275,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id===JSCHART_OPERATOR_ID.OP_GOTO_HOME)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return;  //数据还没有到达
 
             var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //获取一屏显示的数据个数
@@ -77289,7 +77293,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id===JSCHART_OPERATOR_ID.OP_GOTO_END)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             hisData.DataOffset=0;
@@ -77304,7 +77308,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_LEFT_ZOOM_IN || id==JSCHART_OPERATOR_ID.OP_LEFT_ZOOM_OUT)   //{ Step：增加/减少数量 } 左边增加/减少显示个数
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var dataCount=hisData.Data.length;
@@ -77352,7 +77356,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_RIGHT_ZOOM_IN || id==JSCHART_OPERATOR_ID.OP_RIGHT_ZOOM_OUT) //{ Step：增加/减少数量 , ShowCount:显示个数 } 右边增加/减少显示个数
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var dataCount=hisData.Data.length;
@@ -77404,7 +77408,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!this.ChartPaint[0]) return false;
             if (!this.ChartPaint[0].Data) return false;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var paint=this.GetRectSelectPaint();
             if (!paint) return false;
@@ -77490,7 +77494,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!this.ChartPaint[0]) return false;
             if (!this.ChartPaint[0].Data) return false;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var paint=this.GetRectSelectPaint();
             if (!paint) return false;
@@ -77529,7 +77533,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (id==JSCHART_OPERATOR_ID.OP_SCROOLBAR_SLIDER_CHANGED)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             if (obj.Type==0)    //滑块移动
@@ -77565,7 +77569,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (!IFrameSplitOperator.IsNumber(obj.Date)) return;
 
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
 
             var index=this.ChartOperator_GetIndex_ByDateTime(hisData, obj, this.Period, 0);
@@ -77599,7 +77603,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (id==JSCHART_OPERATOR_ID.OP_GOTO_BY_DATAINDEX)  //{PageSize:可选, DataIndex:起始位置数据索引}
         {
             if (!IFrameSplitOperator.IsNumber(obj.DataIndex)) return;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
             if (obj.DataIndex<0 || obj.DataIndex>=hisData.Data.length)
             {
@@ -77627,7 +77631,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             var pageInfo=this.GetChartStatus();
             if (!pageInfo) return;
 
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return;  //数据还没有到达
             
             var start=hisData.DataOffset;
@@ -77691,7 +77695,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     }
 
     //内部函数
-    this.ChartOperator_Temp_GetHistroyData=function()
+    this.ChartOperator_Temp_GetHistoryData=function()
     {
         var hisData=null;
         if (!this.Frame.Data) hisData=this.Frame.Data;
@@ -77701,6 +77705,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return hisData;
     }
 
+    this.ChartOperator_Temp_GetHistroyData=this.ChartOperator_Temp_GetHistoryData;  //兼容老版本
+
     this.ChartOperator_Temp_Update=function()
     {
         this.UpdataDataoffset();           //更新数据偏移
@@ -79461,7 +79467,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             var kLineDrawType=this.GetKLineDrawType();
             var dateRange=null;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (hisData) dateRange=hisData.GetDateRange();
             var obj=
             {
@@ -79710,7 +79716,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             var kLineDrawType=this.GetKLineDrawType();
             var dateRange=null;
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (hisData) dateRange=hisData.GetDateRange();
             var obj=
             {
@@ -84463,7 +84469,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var kItem=null;
         if (this.ChartCorssCursor.ClientPos>=0)
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return false;  //数据还没有到达
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
     
@@ -84473,7 +84479,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else    //取最后一个数据
         {   
-            var hisData=this.ChartOperator_Temp_GetHistroyData();;
+            var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return false;  //数据还没有到达
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
             var kItem=hisData.Data[hisData.Data.length-1];
@@ -91618,7 +91624,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
 
         if (funcName!="Update")
         {
-            var hisData=this.ChartOperator_Temp_GetHistroyData();
+            var hisData=this.ChartOperator_Temp_GetHistoryData();
             if (!hisData) return false;
 
             var count=hisData.Data.length;
@@ -91669,7 +91675,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
     this.MoveNextKLineData=function(option) //{PageSize:, Step:}
     {
         if (this.TrainDataCount<=0) return false;
-        var hisData=this.ChartOperator_Temp_GetHistroyData();
+        var hisData=this.ChartOperator_Temp_GetHistoryData();
         if (!hisData) return false;
 
         var step=1;
@@ -91750,7 +91756,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
         step=parseInt(step/oneStepWidth);  //除以4个像素
         if (step<=0) return false;
 
-        var data=this.ChartOperator_Temp_GetHistroyData();
+        var data=this.ChartOperator_Temp_GetHistoryData();
         if (!data) return false;
 
         var xPointcount=0;
@@ -91804,7 +91810,7 @@ function KLineTrainSimpleChartContainer(uielement, bHScreen)
 
     this.DataMoveRight=function()
     {
-        var data=this.ChartOperator_Temp_GetHistroyData();
+        var data=this.ChartOperator_Temp_GetHistoryData();
         if (!data) return false;
 
         var xPointcount=0;
@@ -94210,7 +94216,7 @@ function IKLineInfo()
 
         //K线数据范围
         var hisData=null;
-        if (hqChart.ChartOperator_Temp_GetHistroyData)  hisData=hqChart.ChartOperator_Temp_GetHistroyData();
+        if (hqChart.ChartOperator_Temp_GetHistoryData)  hisData=hqChart.ChartOperator_Temp_GetHistoryData();
         if (hisData)
             obj.DateRange=hisData.GetDateRange();
         
@@ -129665,7 +129671,80 @@ function JSReportChartContainer(uielement)
 
     this.OnRightMenu=function(x,y,e)
     {
-       
+        this.PopupRightMenu(x,y,e);
+    }
+
+
+    this.PtInReportChart=function(x,y)  //Type: 2=行  3=表头  4=固定行 
+    {
+        var chart=this.GetReportChart();
+        if (!chart) return null;
+
+        var row=chart.PtInHeader(x,y);
+        if (row) return { Type:3, Row:row, X:x, Y:y };
+
+        row=chart.PtInFixedBody(x,y);
+        if (row) return { Type:4, Row:row , X:x, Y:y };
+
+        row=chart.PtInBody(x,y);
+        if (row) return { Type:2, Row:row , X:x, Y:y };
+
+        return { Type:-1, Row:null, X:x, Y:y  };
+    }
+
+    this.PopupRightMenu=function(x,y, e)
+    {
+        var data=this.PtInReportChart(x,y);
+        if (!data) return;
+        if (!this.JSPopMenu) return;
+
+        data.e=e;
+        var menuData={ Menu:null, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);
+        if (event && event.Callback)
+        {
+            var sendData={ MenuData:menuData, Data:data };
+            event.Callback(event, sendData, this);
+        }
+
+        if (menuData.Menu) this.PopupMenuByRClick(menuData, x, y);
+    }
+
+    //右键菜单
+    this.PopupMenuByRClick=function(menuData, x, y)
+    {
+        if (!this.JSPopMenu) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        x+=rtClient.left+rtScroll.Left;
+        y+=rtClient.top+rtScroll.Top;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByRight(x,y);
+    }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::OnClickRightMenu] ',data);
+        if (!data || !data.Data) return;
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID, aryArgs);
     }
 
     this.UIOnMouseMove=function(e)
@@ -131284,6 +131363,36 @@ function JSReportChartContainer(uielement)
                 if (IFrameSplitOperator.IsNumber(param))
                     this.DeleteColumn(param, {Redraw:true});
                 break;
+            case JSCHART_MENU_ID.CMD_REPORT_CHANGE_COLUMN_ID:
+                if (param!=null && aryArgs[1]) this.ChangeColumn(param, aryArgs[1], { Redraw:true})
+                break;
+        }
+    }
+
+
+    this.ChangeColumn=function(index, newColumn, option)
+    {
+        if (index<0) return;
+        if (!newColumn) return;
+
+        var reportChart=this.GetReportChart();
+        if (!reportChart) return;
+
+        if (!reportChart.ChangeColumn(index, newColumn)) return;
+
+        if (this.SortInfo && this.SortInfo.Field==index &&  this.SortInfo.Sort>0)    //去掉排序
+        {
+            this.SortInfo.Field=-1;
+            this.SortInfo.Sort=0;
+            this.Data.Data=[];
+            if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
+                this.Data.Data=this.SourceData.Data.slice();
+        }
+
+        if (option && option.Redraw)
+        {
+            this.SetSizeChange(true);
+            this.Draw();
         }
     }
 
@@ -132366,6 +132475,134 @@ function ChartReport()
         this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);
     }
 
+    this.CreateColumnItem=function(item)
+    {
+        var colItem=this.GetDefaultColunm(item.Type);
+        if (!colItem) return null;
+
+        if (item.Title) colItem.Title=item.Title;
+        if (item.TextAlign) colItem.TextAlign=item.TextAlign;
+        if (item.TextColor) colItem.TextColor=item.TextColor;
+        if (item.HeaderColor) colItem.HeaderColor=item.HeaderColor;
+        if (item.MaxText) colItem.MaxText=item.MaxText;
+        if (item.MaxText2) colItem.MaxText=item.MaxText2;
+        if (IFrameSplitOperator.IsNumber(item.Space)) colItem.Space=item.Space;
+        if (item.ID) colItem.ID=item.ID;
+        if (item.FullColBGColor) colItem.FullColBGColor=item.FullColBGColor;    //整列背景色
+        if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
+        if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
+        if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
+        if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
+        if (IFrameSplitOperator.IsBool(item.IsDrawCallback)) colItem.IsDrawCallback=item.IsDrawCallback;
+        else colItem.IsDrawCallback=false;
+
+        if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
+        if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
+        if (item.Icon) colItem.Icon=item.Icon;
+        if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
+
+        //点击表头弹出菜单
+        if (IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu)) colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;
+
+        if (item.Sort==1 || item.Sort==2)   //1本地排序 2=远程排序
+        {
+            colItem.SortType=[1,2];         //默认 降序 ，升序
+            if (IFrameSplitOperator.IsNonEmptyArray(item.SortType)) colItem.SortType=item.SortType.slice();
+        }
+
+        if (item.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            colItem.FormatType=0;   //0=默认格式 1=长度不够使用...
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            colItem.Decimal=2;
+            colItem.FormatType=0;   //0=默认格式化 1=原始输出 2=科学计数 3=成交量格式化
+            colItem.ColorType=0;    //0=默认使用TextColor,  1=（>0涨,<0跌）2=(>昨收涨,<昨收跌)
+            if (IFrameSplitOperator.IsNumber(item.Decimal)) colItem.Decimal=item.Decimal;            //小数位数
+            if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
+            if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType;      //颜色属性
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            colItem.FormatType=0;   //0=yyyy-mm-dd 1=YYYY/MM/DD
+            colItem.ValueType=0;    //0=yyyymmdd 1=hhmmss
+            if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
+            if (IFrameSplitOperator.IsNumber(item.ValueType)) colItem.FormatType=item.ValueType;   //输出样式
+            
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            if (item.CheckBox) colItem.CheckBox=CloneData(item.CheckBox);
+            else colItem.CheckBox=this.CheckBoxConfig;
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            if (item.Button) colItem.Button=CloneData(item.Button);
+            else colItem.Button=this.ButtonConfig;
+        }
+        else if (this.IsReserveButtonColumn(item.Type))
+        {
+            if (item.Button) colItem.Button=CloneData(item.Button);
+            else colItem.Button=this.ButtonConfig;
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
+            else colItem.ProgressBar=this.ProgressBarConfig;
+        }
+        else if (this.IsReserveProgressBarColumn(item.Type))
+        {
+            if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
+            else colItem.ProgressBar=this.ProgressBarConfig;
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
+        {
+            if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
+            if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+            if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+            if (item.Link) colItem.Link=CloneData(item.Link);
+            else colItem.Link=this.LinkConfig;
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
+        {
+
+        }
+        else if (item.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID)
+        {
+            if (IFrameSplitOperator.IsBool(item.IsDrawArea)) colItem.IsDrawArea=item.IsDrawArea;
+        }
+        else if(item.Type==REPORT_COLUMN_ID.TIME_ID)
+        {
+            if (IFrameSplitOperator.IsNumber(item.ValueType)) colItem.ValueType=item.ValueType;
+        }
+        else if (item.Type==REPORT_COLUMN_ID.DATE_ID)
+        {
+            if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;
+        }
+
+        return colItem;
+    }
+
     this.SetColumn=function(aryColumn)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(aryColumn)) return;
@@ -132374,130 +132611,9 @@ function ChartReport()
         for(var i=0;i<aryColumn.length;++i)
         {
             var item=aryColumn[i];
-            var colItem=this.GetDefaultColunm(item.Type);
+            var colItem=this.CreateColumnItem(item);
             if (!colItem) continue;
 
-            if (item.Title) colItem.Title=item.Title;
-            if (item.TextAlign) colItem.TextAlign=item.TextAlign;
-            if (item.TextColor) colItem.TextColor=item.TextColor;
-            if (item.HeaderColor) colItem.HeaderColor=item.HeaderColor;
-            if (item.MaxText) colItem.MaxText=item.MaxText;
-            if (item.MaxText2) colItem.MaxText=item.MaxText2;
-            if (IFrameSplitOperator.IsNumber(item.Space)) colItem.Space=item.Space;
-            if (item.ID) colItem.ID=item.ID;
-            if (item.FullColBGColor) colItem.FullColBGColor=item.FullColBGColor;    //整列背景色
-            if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
-            if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
-            if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
-            if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
-            if (IFrameSplitOperator.IsBool(item.IsDrawCallback)) colItem.IsDrawCallback=item.IsDrawCallback;
-            else colItem.IsDrawCallback=false;
-
-            if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
-            if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
-            if (item.Icon) colItem.Icon=item.Icon;
-            if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
-
-            //点击表头弹出菜单
-            if (IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu)) colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;
-
-            if (item.Sort==1 || item.Sort==2)   //1本地排序 2=远程排序
-            {
-                colItem.SortType=[1,2];         //默认 降序 ，升序
-                if (IFrameSplitOperator.IsNonEmptyArray(item.SortType)) colItem.SortType=item.SortType.slice();
-            }
-
-            if (item.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                colItem.FormatType=0;   //0=默认格式 1=长度不够使用...
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                colItem.Decimal=2;
-                colItem.FormatType=0;   //0=默认格式化 1=原始输出 2=科学计数 3=成交量格式化
-                colItem.ColorType=0;    //0=默认使用TextColor,  1=（>0涨,<0跌）2=(>昨收涨,<昨收跌)
-                if (IFrameSplitOperator.IsNumber(item.Decimal)) colItem.Decimal=item.Decimal;            //小数位数
-                if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
-                if (IFrameSplitOperator.IsNumber(item.ColorType)) colItem.ColorType=item.ColorType;      //颜色属性
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;   //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                colItem.FormatType=0;   //0=yyyy-mm-dd 1=YYYY/MM/DD
-                colItem.ValueType=0;    //0=yyyymmdd 1=hhmmss
-                if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;   //输出样式
-                if (IFrameSplitOperator.IsNumber(item.ValueType)) colItem.FormatType=item.ValueType;   //输出样式
-                
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                if (item.CheckBox) colItem.CheckBox=CloneData(item.CheckBox);
-                else colItem.CheckBox=this.CheckBoxConfig;
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                if (item.Button) colItem.Button=CloneData(item.Button);
-                else colItem.Button=this.ButtonConfig;
-            }
-            else if (this.IsReserveButtonColumn(item.Type))
-            {
-                if (item.Button) colItem.Button=CloneData(item.Button);
-                else colItem.Button=this.ButtonConfig;
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
-                else colItem.ProgressBar=this.ProgressBarConfig;
-            }
-            else if (this.IsReserveProgressBarColumn(item.Type))
-            {
-                if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
-                else colItem.ProgressBar=this.ProgressBarConfig;
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
-            {
-                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
-                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
-                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
-                if (item.Link) colItem.Link=CloneData(item.Link);
-                else colItem.Link=this.LinkConfig;
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
-            {
-
-            }
-            else if (item.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID)
-            {
-                if (IFrameSplitOperator.IsBool(item.IsDrawArea)) colItem.IsDrawArea=item.IsDrawArea;
-            }
-            else if(item.Type==REPORT_COLUMN_ID.TIME_ID)
-            {
-                if (IFrameSplitOperator.IsNumber(item.ValueType)) colItem.ValueType=item.ValueType;
-            }
-            else if (item.Type==REPORT_COLUMN_ID.DATE_ID)
-            {
-                if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;
-            }
-            
-
             this.Column.push(colItem);
         }
     }
@@ -132527,6 +132643,17 @@ function ChartReport()
         return true;
     }
 
+    this.ChangeColumn=function(index, newColumn)
+    {
+        if (index<0 || index>=this.Column.length) return false;
+
+        var colItem=this.CreateColumnItem(newColumn);
+        if (!colItem) return false;
+        this.Column[index]=colItem;
+
+        return true;
+    }
+
     this.GetXScrollPos=function()
     {
         return this.Data.XOffset;
@@ -135111,7 +135238,9 @@ function ChartReport()
                 this.Canvas.lineTo(x,yCenter);
                 this.Canvas.lineTo(ptFirst.X,yCenter);
                 this.Canvas.closePath();
-                this.SetFillStyle(this.CloseLineConfig.AreaColor,left,top, left,bottom);
+                var areaColor=this.CloseLineConfig.AreaColor;
+                if (lineData.AreaColor) areaColor=lineData.AreaColor;
+                this.SetFillStyle(areaColor,left,top, left,bottom);
                 this.Canvas.fill();
             }
         }
@@ -140105,7 +140234,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14210";
+var HQCHART_VERSION="1.1.14222";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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