hqchart 1.1.14881 → 1.1.14888
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/umychart.vue.js +8 -6
- package/package.json +1 -1
- package/src/jscommon/umychart.js +16 -6
- package/src/jscommon/umychart.report.js +47 -6
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +64 -13
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +64 -13
package/lib/umychart.vue.js
CHANGED
|
@@ -1181,7 +1181,8 @@ for(var i=0;i<chart.Frame.SubFrame.length;++i){chart.Frame.SubFrame[i].Frame.Cha
|
|
|
1181
1181
|
};this.SetChartBorder=function(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;else option.Border.Left=chart.Frame.ChartBorder.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;else option.Border.Right=chart.Frame.ChartBorder.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;else option.Border.Top=chart.Frame.ChartBorder.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;else option.Border.Bottom=chart.Frame.ChartBorder.Bottom;if(item.AutoLeft){chart.Frame.AutoLeftBorder={};if(IFrameSplitOperator.IsNumber(item.AutoLeft.Blank))chart.Frame.AutoLeftBorder.Blank=item.AutoLeft.Blank;if(IFrameSplitOperator.IsNumber(item.AutoLeft.MinWidth))chart.Frame.AutoLeftBorder.MinWidth=item.AutoLeft.MinWidth;}if(item.AutoRight){chart.Frame.AutoRightBorder={};if(IFrameSplitOperator.IsNumber(item.AutoRight.Blank))chart.Frame.AutoRightBorder.Blank=item.AutoRight.Blank;if(IFrameSplitOperator.IsNumber(item.AutoRight.MinWidth))chart.Frame.AutoRightBorder.MinWidth=item.AutoRight.MinWidth;}};this.SetEventCallback=function(chart,aryCallback){if(!chart)return;if(!IFrameSplitOperator.IsNonEmptyArray(aryCallback))return;for(var i=0;i<aryCallback.length;++i){var item=aryCallback[i];chart.AddEventCallback(item);}};/////////////////////////////////////////////////////////////////////////////////
|
|
1182
1182
|
//属性设置
|
|
1183
1183
|
//
|
|
1184
|
-
this.SetPressKeyboardConfig=function(chart,option){if(!chart||!option)return;if(IFrameSplitOperator.IsBool(option.PauseUpdate))chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;}
|
|
1184
|
+
this.SetPressKeyboardConfig=function(chart,option){if(!chart||!option)return;if(IFrameSplitOperator.IsBool(option.PauseUpdate))chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;};//缺口设置 KLine:{ PriceGap:{ Enable, Count } }
|
|
1185
|
+
this.SetPriceGapConfig=function(chart,option){if(!option||!option.PriceGap)return;var klineChart=chart.ChartPaint[0];if(!klineChart)return;var item=option.PriceGap;if(IFrameSplitOperator.IsBool(item.Enable))klineChart.PriceGap.Enable=item.Enable;if(IFrameSplitOperator.IsNumber(item.Count))klineChart.PriceGap.Count=item.Count;};//历史K线图
|
|
1185
1186
|
this.CreateKLineChartContainer=function(option){var _this=this;var chart=null;if(option.Type==="历史K线图横屏")chart=new KLineChartHScreenContainer(this.CanvasElement);else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);chart.GetExtraCanvas=function(name){return _this.GetExtraCanvas(name);};var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);if(extraElement)chart.SetCorssCursorElement(extraElement);if(option.EventCallback)this.SetEventCallback(chart,option.EventCallback);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;var pixelRatio=GetDevicePixelRatio();//右键菜单
|
|
1186
1187
|
if(IFrameSplitOperator.IsBool(option.IsShowRightMenu))chart.IsShowRightMenu=option.IsShowRightMenu;if(option.ScriptError)chart.ScriptErrorCallback=option.ScriptError;if(option.EnableScrollUpDown==true)chart.EnableScrollUpDown=option.EnableScrollUpDown;if(option.DisableMouse==true)chart.DisableMouse=option.DisableMouse;if(option.TouchMoveMinAngle)chart.TouchMoveMinAngle=option.TouchMoveMinAngle;if(option.EnableZoomUpDown)chart.EnableZoomUpDown=option.EnableZoomUpDown;if(IFrameSplitOperator.IsString(option.SplashTitle))chart.LoadDataSplashTitle=option.SplashTitle;if(IFrameSplitOperator.IsBool(option.EnableZoomIndexWindow))chart.EnableZoomIndexWindow=option.EnableZoomIndexWindow;if(IFrameSplitOperator.IsBool(option.IsDrawPictureXY))chart.IsDrawPictureXY=option.IsDrawPictureXY;if(IFrameSplitOperator.IsNumber(option.CtrlMoveStep))chart.CtrlMoveStep=option.CtrlMoveStep;if(IFrameSplitOperator.IsNumber(option.ShiftMoveStep))chart.ShiftMoveStep=option.ShiftMoveStep;if(IFrameSplitOperator.IsBool(option.EnableIndexChartDrag))chart.EnableIndexChartDrag=option.EnableIndexChartDrag;if(IFrameSplitOperator.IsBool(option.EnableVerifyRecvData))chart.EnableVerifyRecvData=option.EnableVerifyRecvData;if(option.GlobalOption){var item=option.GlobalOption;if(IFrameSplitOperator.IsBool(item.IsValueFullRange))chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;if(item.SelectedBorder){var subItem=item.SelectedBorder;if(IFrameSplitOperator.IsNumber(subItem.Mode))chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;}}if(option.EnableYDrag){var item=option.EnableYDrag;if(IFrameSplitOperator.IsBool(item.Left))chart.EnableYDrag.Left=item.Left;if(IFrameSplitOperator.IsBool(item.Right))chart.EnableYDrag.Right=item.Right;if(IFrameSplitOperator.IsBool(item.Wheel))chart.EnableYDrag.Wheel=item.Wheel;if(IFrameSplitOperator.IsNumber(item.WheelYMove))chart.EnableYDrag.WheelYMove=item.WheelYMove;}if(option.EnableXDrag){var item=option.EnableXDrag;if(IFrameSplitOperator.IsBool(item.Bottom))chart.EnableXDrag.Bottom=item.Bottom;if(item.LButton&&IFrameSplitOperator.IsNumber(item.LButton.Type))chart.EnableXDrag.LButton.Type=item.LButton.Type;if(item.RButton&&IFrameSplitOperator.IsNumber(item.RButton.Type))chart.EnableXDrag.RButton.Type=item.RButton.Type;}if(option.KLineTooltip){var item=option.KLineTooltip;if(IFrameSplitOperator.IsBool(item.Enable))chart.KLineTooltipConfig.Enable=item.Enable;if(IFrameSplitOperator.IsBool(item.EnableKeyDown))chart.KLineTooltipConfig.EnableKeyDown=item.EnableKeyDown;}if(option.KLine)//k线图的属性设置
|
|
1187
1188
|
{var item=option.KLine;if(option.KLine.DragMode>=0)chart.DragMode=option.KLine.DragMode;if(option.KLine.Right>=0)chart.Right=option.KLine.Right;if(option.KLine.Period>=0)chart.Period=option.KLine.Period;if(option.KLine.MaxReqeustDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxReqeustDataCount;//兼容老版本
|
|
@@ -1204,7 +1205,7 @@ option.CorssCursor={};option.CorssCursor.TitleHeight=chart.ChartCorssCursor.Text
|
|
|
1204
1205
|
}if(item.IsShowRightText===false||item.IsShowRightText===true){chart.Frame.SubFrame[i].Frame.IsShowYText[1]=item.IsShowRightText;chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowRightText=item.IsShowRightText;//显示右边刻度
|
|
1205
1206
|
}if(item.TopSpace>=0)chart.Frame.SubFrame[i].Frame.ChartBorder.TopSpace=item.TopSpace*pixelRatio;if(item.BottomSpace>=0)chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace*pixelRatio;if(item.RightTextPosition>0)chart.Frame.SubFrame[i].Frame.YTextPosition[1]=item.RightTextPosition;if(item.LeftTextPosition>0)chart.Frame.SubFrame[i].Frame.YTextPosition[0]=item.LeftTextPosition;if(item.IsShowXLine==false)chart.Frame.SubFrame[i].Frame.IsShowXLine=item.IsShowXLine;if(item.IsShowYLine==false)chart.Frame.SubFrame[i].Frame.IsShowYLine=item.IsShowYLine;if(IFrameSplitOperator.IsNumber(item.YTextBaseline))chart.Frame.SubFrame[i].Frame.YTextBaseline=item.YTextBaseline;if(item.YCoordinateType>0)chart.Frame.SubFrame[0].Frame.YSplitOperator.CoordinateType=item.YCoordinateType;if(item.IsYReverse==true)chart.Frame.SubFrame[0].Frame.CoordinateType=1;//反转坐标
|
|
1206
1207
|
if(IFrameSplitOperator.IsNumber(item.PercentageTextFormat))subFrame.YSplitOperator.PercentageTextFormat=item.PercentageTextFormat;//百分比坐标格式
|
|
1207
|
-
if(item.DefaultYMaxMin)chart.Frame.SubFrame[i].Frame.YSplitOperator.DefaultYMaxMin=item.DefaultYMaxMin;if(IFrameSplitOperator.IsBool(item.EnableRemoveZero))chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;if(IFrameSplitOperator.IsPlusNumber(item.MinYDistance))chart.Frame.SubFrame[i].Frame.MinYDistance=item.MinYDistance;if(IFrameSplitOperator.IsNumber(item.BorderLine))chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;if(IFrameSplitOperator.IsBool(item.IsShowIndexTitle))chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine))subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;if(item.ClientBGColor)subFrame.ClientBGColor=item.ClientBGColor;}}if(option.KLine){var item=option.KLine;var klineChart=chart.ChartPaint[0];if(option.KLine.ShowKLine==false)klineChart.IsShow=false;if(option.KLine.InfoPosition>0)klineChart.InfoPosition=option.KLine.InfoPosition;if(IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice))klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;if(IFrameSplitOperator.IsNumber(item.OneLimitBarType))klineChart.OneLimitBarType=item.OneLimitBarType;if(IFrameSplitOperator.IsNumber(item.UnchangeBarType))klineChart.UnchangeBarType=item.UnchangeBarType;if(
|
|
1208
|
+
if(item.DefaultYMaxMin)chart.Frame.SubFrame[i].Frame.YSplitOperator.DefaultYMaxMin=item.DefaultYMaxMin;if(IFrameSplitOperator.IsBool(item.EnableRemoveZero))chart.Frame.SubFrame[i].Frame.YSplitOperator.EnableRemoveZero=item.EnableRemoveZero;if(IFrameSplitOperator.IsPlusNumber(item.MinYDistance))chart.Frame.SubFrame[i].Frame.MinYDistance=item.MinYDistance;if(IFrameSplitOperator.IsNumber(item.BorderLine))chart.Frame.SubFrame[i].Frame.BorderLine=item.BorderLine;if(IFrameSplitOperator.IsBool(item.IsShowIndexTitle))chart.Frame.SubFrame[i].Frame.IsShowIndexTitle=item.IsShowIndexTitle;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBottomLine))subFrame.IsDrawTitleBottomLine=item.IsDrawTitleBottomLine;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;if(item.ClientBGColor)subFrame.ClientBGColor=item.ClientBGColor;}}if(option.KLine){var item=option.KLine;var klineChart=chart.ChartPaint[0];if(option.KLine.ShowKLine==false)klineChart.IsShow=false;if(option.KLine.InfoPosition>0)klineChart.InfoPosition=option.KLine.InfoPosition;if(IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice))klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;if(IFrameSplitOperator.IsNumber(item.OneLimitBarType))klineChart.OneLimitBarType=item.OneLimitBarType;if(IFrameSplitOperator.IsNumber(item.UnchangeBarType))klineChart.UnchangeBarType=item.UnchangeBarType;if(IFrameSplitOperator.IsBool(item.EnablePrediction))klineChart.PredictionConfig.Enable=item.EnablePrediction;if(IFrameSplitOperator.IsBool(item.EnableDaySummary))klineChart.DaySummary.Enable=item.EnableDaySummary;this.SetPriceGapConfig(chart,option.KLine);}if(option.KLineTitle){var item=option.KLineTitle;var chartTitle=chart.TitlePaint[0];if(option.KLineTitle.IsShowName==false)chart.TitlePaint[0].IsShowName=false;if(option.KLineTitle.IsShowSettingInfo==false)chart.TitlePaint[0].IsShowSettingInfo=false;if(option.KLineTitle.IsShow==false)chart.TitlePaint[0].IsShow=false;if(IFrameSplitOperator.IsBool(item.IsShowDateTime))chartTitle.IsShowDateTime=item.IsShowDateTime;if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData))chart.IsTitleShowLatestData=item.IsTitleShowLatestData;if(item.ShowPosition||item.ShowPostion)//显示位置高级配置
|
|
1208
1209
|
{var subItem=item.ShowPostion;if(item.ShowPosition)subItem=item.ShowPosition;if(!chartTitle.ShowPositionConfig)chartTitle.ShowPositionConfig={Margin:{}};if(IFrameSplitOperator.IsNumber(subItem.Type))chartTitle.ShowPositionConfig.Type=subItem.Type;if(subItem.Margin){if(IFrameSplitOperator.IsNumber(subItem.Margin.Left))chartTitle.ShowPositionConfig.Margin.Left=subItem.Margin.Left;if(IFrameSplitOperator.IsNumber(subItem.Margin.Right))chartTitle.ShowPositionConfig.Margin.Right=subItem.Margin.Right;if(IFrameSplitOperator.IsNumber(subItem.Margin.Bottom))chartTitle.ShowPositionConfig.Margin.Bottom=subItem.Margin.Bottom;}}}//叠加股票
|
|
1209
1210
|
if(option.Overlay){for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];chart.OverlaySymbol(item.Symbol,item);}}if(option.ExtendChart){for(var i=0;i<option.ExtendChart.length;++i){var item=option.ExtendChart[i];chart.CreateExtendChart(item.Name,item);}}//创建子窗口的指标
|
|
1210
1211
|
var scriptData=new JSIndexScript();if(option.ColorIndex)//五彩K线
|
|
@@ -1332,7 +1333,7 @@ if(option.CorssCursorInfo.PressTime)chart.PressTime=option.CorssCursorInfo.Press
|
|
|
1332
1333
|
if(option.CorssCursorInfo.HPenType>0)chart.ChartCorssCursor.HPenType=option.CorssCursorInfo.HPenType;if(option.CorssCursorInfo.VPenType>0)chart.ChartCorssCursor.VPenType=option.CorssCursorInfo.VPenType;}//保存十字光标文字高度
|
|
1333
1334
|
option.CorssCursor={};option.CorssCursor.TitleHeight=chart.ChartCorssCursor.TextHeight;if(option.Frame){for(var i=0;i<option.Frame.length;++i){var item=option.Frame[i];if(!chart.Frame.SubFrame[i])continue;if(item.SplitCount)chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;if(item.StringFormat)chart.Frame.SubFrame[i].Frame.YSplitOperator.StringFormat=item.StringFormat;if(IFrameSplitOperator.IsNumber(item.FloatPrecision))chart.Frame.SubFrame[i].Frame.YSplitOperator.FloatPrecision=item.FloatPrecision;if(item.Custom)chart.Frame.SubFrame[i].Frame.YSplitOperator.Custom=item.Custom;if(IFrameSplitOperator.IsNumber(item.SplitType))chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitType=item.SplitType;if(item.Height>0)chart.Frame.SubFrame[i].Height=item.Height;if(item.IsShowLeftText==false)chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowLeftText=item.IsShowLeftText;//显示左边刻度
|
|
1334
1335
|
if(item.IsShowRightText==false)chart.Frame.SubFrame[i].Frame.YSplitOperator.IsShowRightText=item.IsShowRightText;//显示右边刻度
|
|
1335
|
-
}}if(option.KLine){if(option.KLine.ShowKLine==false)chart.ChartPaint[0].IsShow=false;if(option.KLine.InfoPosition>0)chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition;if(option.KLine.IsShowMaxMinPrice==false)chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice;}if(option.KLineTitle)//股票名称 日期 周期
|
|
1336
|
+
}}if(option.KLine){if(option.KLine.ShowKLine==false)chart.ChartPaint[0].IsShow=false;if(option.KLine.InfoPosition>0)chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition;if(option.KLine.IsShowMaxMinPrice==false)chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice;this.SetPriceGapConfig(chart,option.KLine);}if(option.KLineTitle)//股票名称 日期 周期
|
|
1336
1337
|
{if(option.KLineTitle.IsShowName==false)chart.TitlePaint[0].IsShowName=false;if(option.KLineTitle.IsShowSettingInfo==false)chart.TitlePaint[0].IsShowSettingInfo=false;if(option.KLineTitle.IsShow==false)chart.TitlePaint[0].IsShow=false;}if(IFrameSplitOperator.IsNonEmptyArray(option.Overlay))//叠加股票
|
|
1337
1338
|
{for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];chart.OverlaySymbol(item.Symbol,item);}}if(option.ExtendChart){for(var i=0;i<option.ExtendChart.length;++i){var item=option.ExtendChart[i];chart.CreateExtendChart(item.Name,item);}}if(IFrameSplitOperator.IsNonEmptyArray(option.Windows)){//创建子窗口的指标
|
|
1338
1339
|
for(var i=0;i<option.Windows.length;++i){var item=option.Windows[i];if(item.Script){chart.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
|
|
@@ -13563,9 +13564,10 @@ if(event&&event.Callback){var data={PreventDefault:false,CommandID:cmdID,Args:ar
|
|
|
13563
13564
|
if(IFrameSplitOperator.IsNonEmptyArray(aryArgs)){srcParam=aryArgs[0];if(IFrameSplitOperator.IsNumber(aryArgs[0]))param=aryArgs[0];}switch(cmdID){case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:if(srcParam)this.ChangeSymbol(srcParam);break;case JSCHART_MENU_ID.CMD_REPORT_COLUMN_SORT_ID:if(IFrameSplitOperator.IsNumber(param)&&IFrameSplitOperator.IsNumber(aryArgs[1]))this.SortColumn(param,aryArgs[1]);break;case JSCHART_MENU_ID.CMD_REPORT_COLUMN_MOVE_ID:if(IFrameSplitOperator.IsNumber(param)&&IFrameSplitOperator.IsNumber(aryArgs[1])){var leftIndex=param;var rightIndex=param+aryArgs[1];this.SwapColumn(leftIndex,rightIndex,{Redraw:true});}break;case JSCHART_MENU_ID.CMD_REPORT_COLUMN_DEL_ID: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)//去掉排序
|
|
13564
13565
|
{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();}};this.SwapColumn=function(leftIndex,rightIndex,option){var reportChart=this.GetReportChart();if(!reportChart)return;if(!reportChart.SwapColumn(leftIndex,rightIndex))return;if(option&&option.Redraw){this.SetSizeChange(true);this.Draw();}};this.DeleteColumn=function(index,option){var reportChart=this.GetReportChart();if(!reportChart)return;if(!reportChart.DeleteColumn(index))return;if(option&&option.Redraw){this.SetSizeChange(true);this.Draw();}};//本地排序
|
|
13565
13566
|
this.LocalSort=function(left,right,column,sortType){switch(column.Type){case REPORT_COLUMN_ID.SYMBOL_ID:case REPORT_COLUMN_ID.NAME_ID:return this.LocalStringSort(left,right,column,sortType);case REPORT_COLUMN_ID.NAME_EX_ID:return this.LocalNameExSort(left,right,column,sortType);case REPORT_COLUMN_ID.PRICE_ID:case REPORT_COLUMN_ID.VOL_ID:case REPORT_COLUMN_ID.INCREASE_ID:case REPORT_COLUMN_ID.UPDOWN_ID:case REPORT_COLUMN_ID.BUY_PRICE_ID:case REPORT_COLUMN_ID.SELL_PRICE_ID:case REPORT_COLUMN_ID.AMOUNT_ID:case REPORT_COLUMN_ID.BUY_VOL_ID:case REPORT_COLUMN_ID.SELL_VOL_ID:case REPORT_COLUMN_ID.YCLOSE_ID:case REPORT_COLUMN_ID.OPEN_ID:case REPORT_COLUMN_ID.HIGH_ID:case REPORT_COLUMN_ID.LOW_ID:case REPORT_COLUMN_ID.AVERAGE_PRICE_ID:case REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID:case REPORT_COLUMN_ID.TOTAL_SHARES_ID:case REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID:case REPORT_COLUMN_ID.MARKET_VALUE_ID:case REPORT_COLUMN_ID.EXCHANGE_RATE_ID:case REPORT_COLUMN_ID.AMPLITUDE_ID:case REPORT_COLUMN_ID.LIMIT_HIGH_ID:case REPORT_COLUMN_ID.LIMIT_LOW_ID://期货字段
|
|
13566
|
-
case REPORT_COLUMN_ID.FUTURES_POSITION_ID:case REPORT_COLUMN_ID.FUTURES_CLOSE_ID:case REPORT_COLUMN_ID.FUTURES_YCLOSE_ID:case REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID:case REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID:case REPORT_COLUMN_ID.VOL_IN_ID:case REPORT_COLUMN_ID.VOL_OUT_ID:case REPORT_COLUMN_ID.DATE_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:return this.LocalNumberSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID://自定义数值字段
|
|
13567
|
+
case REPORT_COLUMN_ID.FUTURES_POSITION_ID:case REPORT_COLUMN_ID.FUTURES_CLOSE_ID:case REPORT_COLUMN_ID.FUTURES_YCLOSE_ID:case REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID:case REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID:case REPORT_COLUMN_ID.VOL_IN_ID:case REPORT_COLUMN_ID.VOL_OUT_ID:case REPORT_COLUMN_ID.DATE_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:return this.LocalNumberSort(left,right,column,sortType);case REPORT_COLUMN_ID.RESERVE_DATETIME1_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME2_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME3_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME4_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME5_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME6_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME7_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:return this.LocalDateTimeSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID://自定义数值字段
|
|
13567
13568
|
return this.LoacCustomNumberSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID://自定义字符串字段
|
|
13568
|
-
return this.LoacCustomStringSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID:return this.LoacCustomDateTimeSort(left,right,column,sortType);default:return 0;}};this.GetStockExtendData=function(symbol,column){if(IFrameSplitOperator.IsNumber(column.DataIndex)){if(column.DataIndex<0)return null;var stock=this.GetStockData(symbol);if(!stock||!stock.ExtendData)return null;return stock.ExtendData[column.DataIndex];}if(IFrameSplitOperator.IsNumber(column.BlockIndex)){if(column.BlockIndex<0)return null;var stock=this.GetBlockData(symbol);if(!stock)return null;return stock[column.BlockIndex];}return null;};this.LocalNameExSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue="",rightValue="";if(sortType==2){leftValue="啊啊啊啊啊";rightValue="啊啊啊啊啊";}if(leftStock&&leftStock.Name)leftValue=leftStock.Name;if(rightStock&&rightStock.Name)rightValue=rightStock.Name;if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LocalStringSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue="",rightValue="";if(sortType==2){leftValue="啊啊啊啊啊";rightValue="啊啊啊啊啊";}var filedName=MAP_COLUMN_FIELD.get(column.Type);if(leftStock&&leftStock[filedName])leftValue=leftStock[filedName];if(rightStock&&rightStock[filedName])rightValue=rightStock[filedName];if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue
|
|
13569
|
+
return this.LoacCustomStringSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID:return this.LoacCustomDateTimeSort(left,right,column,sortType);default:return 0;}};this.GetStockExtendData=function(symbol,column){if(IFrameSplitOperator.IsNumber(column.DataIndex)){if(column.DataIndex<0)return null;var stock=this.GetStockData(symbol);if(!stock||!stock.ExtendData)return null;return stock.ExtendData[column.DataIndex];}if(IFrameSplitOperator.IsNumber(column.BlockIndex)){if(column.BlockIndex<0)return null;var stock=this.GetBlockData(symbol);if(!stock)return null;return stock[column.BlockIndex];}return null;};this.LocalNameExSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue="",rightValue="";if(sortType==2){leftValue="啊啊啊啊啊";rightValue="啊啊啊啊啊";}if(leftStock&&leftStock.Name)leftValue=leftStock.Name;if(rightStock&&rightStock.Name)rightValue=rightStock.Name;if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue<leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LocalStringSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue="",rightValue="";if(sortType==2){leftValue="啊啊啊啊啊";rightValue="啊啊啊啊啊";}var filedName=MAP_COLUMN_FIELD.get(column.Type);if(leftStock&&leftStock[filedName])leftValue=leftStock[filedName];if(rightStock&&rightStock[filedName])rightValue=rightStock[filedName];if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LocalNumberSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue=-99999999999999,rightValue=-99999999999999;if(sortType==2)leftValue=rightValue=99999999999999;var filedName=MAP_COLUMN_FIELD.get(column.Type);if(leftStock&&IFrameSplitOperator.IsNumber(leftStock[filedName]))leftValue=leftStock[filedName];if(rightStock&&IFrameSplitOperator.IsNumber(rightStock[filedName]))rightValue=rightStock[filedName];if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};//Date数据排序
|
|
13570
|
+
this.LocalDateTimeSort=function(left,right,column,sortType){var leftStock=this.GetStockData(left);var rightStock=this.GetStockData(right);var leftValue=new Date(0),rightValue=new Date(0);if(sortType==2)leftValue=rightValue=Date(2999,12,30);var filedName=MAP_COLUMN_FIELD.get(column.Type);if(leftStock&&leftStock[filedName])leftValue=leftStock[filedName];if(rightStock&&rightStock[filedName])rightValue=rightStock[filedName];if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LoacCustomNumberSort=function(left,right,column,sortType){var leftValue=-99999999999999,rightValue=-99999999999999;if(sortType==2)leftValue=rightValue=99999999999999;var value=this.GetStockExtendData(left,column);if(IFrameSplitOperator.IsNumber(value))leftValue=value;var value=this.GetStockExtendData(right,column);if(IFrameSplitOperator.IsNumber(value))rightValue=value;if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LoacCustomDateTimeSort=function(left,right,column,sortType){var leftValue=-99999999999999,rightValue=-99999999999999;if(sortType==2)leftValue=rightValue=99999999999999;var value=this.GetStockExtendData(left,column);if(IFrameSplitOperator.IsNumber(value))leftValue=value;var value=this.GetStockExtendData(right,column);if(IFrameSplitOperator.IsNumber(value))rightValue=value;if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.LoacCustomStringSort=function(left,right,column,sortType){var leftValue="",rightValue="";if(sortType==2)rightValue=leftValue="啊啊啊啊啊";var value=this.GetStockExtendData(left,column);if(IFrameSplitOperator.IsString(value))leftValue=value;var value=this.GetStockExtendData(right,column);if(IFrameSplitOperator.IsString(value))rightValue=value;if(sortType==1){if(rightValue<leftValue)return-1;else if(rightValue>leftValue)return 1;else return 0;}else{if(leftValue<rightValue)return-1;else if(leftValue>rightValue)return 1;else return 0;}};this.RequestStockSortData=function(column,filedid,sortType){var chart=this.ChartPaint[0];if(!chart)return;var self=this;var startIndex=this.Data.YOffset;var pageSize=chart.GetPageSize();var endIndex=startIndex+pageSize;if(endIndex>=this.Data.Data.length)endIndex=this.Data.Data.length-1;if(this.NetworkFilter){var obj={Name:'JSDealChartContainer::RequestStockSortData',//类名::函数名
|
|
13569
13571
|
Explain:'报价列表股票排序数据',Request:{Data:{range:{start:startIndex,end:endIndex,count:this.Data.Data.length},column:{name:column.Title,type:column.Type,index:filedid,ID:column.ID},sort:sortType,symbol:this.Symbol,name:this.Name,pageSize:pageSize}},Self:this,PreventDefault:false};if(chart.FixedRowCount>0&&chart.FixedRowData.Type==1){var arySymbol=[];for(var i=0;i<chart.FixedRowData.Symbol.length;++i){var item=chart.FixedRowData.Symbol[i];if(item)arySymbol.push(item);}obj.Request.FixedSymbol=arySymbol;}this.NetworkFilter(obj,function(data){self.RecvStockSortData(data);self.AutoUpdate();});if(obj.PreventDefault==true)return;}//throw { Name:'JSReportChartContainer::RequestStockSortData', Error:'(报价列表股票排序数据)不提供内置测试数据' };
|
|
13570
13572
|
};this.RecvStockSortData=function(data){var chart=this.ChartPaint[0];if(!chart)return;var selectedSymbol=chart.GetSelectedSingleSymbol();//更新股票数据
|
|
13571
13573
|
var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){for(var i=0;i<data.data.length;++i){var item=data.data[i];//数据
|
|
@@ -15170,7 +15172,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15170
15172
|
this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
|
|
15171
15173
|
* 版本信息输出
|
|
15172
15174
|
*
|
|
15173
|
-
*/var HQCHART_VERSION="1.1.
|
|
15175
|
+
*/var HQCHART_VERSION="1.1.14887";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
15174
15176
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15175
15177
|
// BaseIndex:BaseIndex,
|
|
15176
15178
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -271,6 +271,18 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
271
271
|
if (IFrameSplitOperator.IsBool(option.PauseUpdate)) chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;
|
|
272
272
|
}
|
|
273
273
|
|
|
274
|
+
//缺口设置 KLine:{ PriceGap:{ Enable, Count } }
|
|
275
|
+
this.SetPriceGapConfig=function(chart, option)
|
|
276
|
+
{
|
|
277
|
+
if (!option || !option.PriceGap) return;
|
|
278
|
+
var klineChart=chart.ChartPaint[0];
|
|
279
|
+
if (!klineChart) return;
|
|
280
|
+
|
|
281
|
+
var item=option.PriceGap;
|
|
282
|
+
if (IFrameSplitOperator.IsBool(item.Enable)) klineChart.PriceGap.Enable=item.Enable;
|
|
283
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) klineChart.PriceGap.Count=item.Count;
|
|
284
|
+
}
|
|
285
|
+
|
|
274
286
|
//历史K线图
|
|
275
287
|
this.CreateKLineChartContainer=function(option)
|
|
276
288
|
{
|
|
@@ -623,14 +635,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
623
635
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
624
636
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
625
637
|
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
626
|
-
if (item.PriceGap)
|
|
627
|
-
{
|
|
628
|
-
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
629
|
-
if (IFrameSplitOperator.IsNumber(item.PriceGap.Count)) klineChart.PriceGap.Count=item.PriceGap.Count;
|
|
630
|
-
}
|
|
631
|
-
|
|
632
638
|
if (IFrameSplitOperator.IsBool(item.EnablePrediction)) klineChart.PredictionConfig.Enable=item.EnablePrediction;
|
|
633
639
|
if (IFrameSplitOperator.IsBool(item.EnableDaySummary)) klineChart.DaySummary.Enable=item.EnableDaySummary;
|
|
640
|
+
|
|
641
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
634
642
|
}
|
|
635
643
|
|
|
636
644
|
if(option.KLineTitle)
|
|
@@ -1646,6 +1654,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
1646
1654
|
if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false;
|
|
1647
1655
|
if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition;
|
|
1648
1656
|
if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice;
|
|
1657
|
+
|
|
1658
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
1649
1659
|
}
|
|
1650
1660
|
|
|
1651
1661
|
if(option.KLineTitle) //股票名称 日期 周期
|
|
@@ -4035,6 +4035,21 @@ function JSReportChartContainer(uielement)
|
|
|
4035
4035
|
case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
|
|
4036
4036
|
|
|
4037
4037
|
return this.LocalNumberSort(left, right, column, sortType);
|
|
4038
|
+
|
|
4039
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME1_ID:
|
|
4040
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME2_ID:
|
|
4041
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME3_ID:
|
|
4042
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME4_ID:
|
|
4043
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME5_ID:
|
|
4044
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME6_ID:
|
|
4045
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME7_ID:
|
|
4046
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
4047
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
4048
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
4049
|
+
return this.LocalDateTimeSort(left, right, column, sortType);
|
|
4050
|
+
|
|
4051
|
+
|
|
4052
|
+
|
|
4038
4053
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
4039
4054
|
return this.LoacCustomNumberSort(left, right, column, sortType);
|
|
4040
4055
|
case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID: //自定义字符串字段
|
|
@@ -4118,7 +4133,7 @@ function JSReportChartContainer(uielement)
|
|
|
4118
4133
|
if (sortType==1)
|
|
4119
4134
|
{
|
|
4120
4135
|
if (rightValue<leftValue) return -1;
|
|
4121
|
-
else if (rightValue
|
|
4136
|
+
else if (rightValue>leftValue) return 1;
|
|
4122
4137
|
else return 0;
|
|
4123
4138
|
}
|
|
4124
4139
|
else
|
|
@@ -4141,12 +4156,38 @@ function JSReportChartContainer(uielement)
|
|
|
4141
4156
|
if (leftStock && IFrameSplitOperator.IsNumber(leftStock[filedName])) leftValue=leftStock[filedName];
|
|
4142
4157
|
if (rightStock && IFrameSplitOperator.IsNumber(rightStock[filedName])) rightValue=rightStock[filedName];
|
|
4143
4158
|
|
|
4144
|
-
|
|
4145
4159
|
|
|
4146
4160
|
if (sortType==1)
|
|
4147
4161
|
{
|
|
4148
4162
|
if (rightValue<leftValue) return -1;
|
|
4149
|
-
else if (rightValue
|
|
4163
|
+
else if (rightValue>leftValue) return 1;
|
|
4164
|
+
else return 0;
|
|
4165
|
+
}
|
|
4166
|
+
else
|
|
4167
|
+
{
|
|
4168
|
+
if (leftValue<rightValue) return -1;
|
|
4169
|
+
else if (leftValue>rightValue) return 1;
|
|
4170
|
+
else return 0;
|
|
4171
|
+
}
|
|
4172
|
+
}
|
|
4173
|
+
|
|
4174
|
+
//Date数据排序
|
|
4175
|
+
this.LocalDateTimeSort=function(left, right, column, sortType)
|
|
4176
|
+
{
|
|
4177
|
+
var leftStock=this.GetStockData(left);
|
|
4178
|
+
var rightStock=this.GetStockData(right);
|
|
4179
|
+
|
|
4180
|
+
var leftValue=new Date(0), rightValue=new Date(0);
|
|
4181
|
+
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
4182
|
+
|
|
4183
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
4184
|
+
if (leftStock && leftStock[filedName]) leftValue=leftStock[filedName];
|
|
4185
|
+
if (rightStock && rightStock[filedName]) rightValue=rightStock[filedName];
|
|
4186
|
+
|
|
4187
|
+
if (sortType==1)
|
|
4188
|
+
{
|
|
4189
|
+
if (rightValue<leftValue) return -1;
|
|
4190
|
+
else if (rightValue>leftValue) return 1;
|
|
4150
4191
|
else return 0;
|
|
4151
4192
|
}
|
|
4152
4193
|
else
|
|
@@ -4171,7 +4212,7 @@ function JSReportChartContainer(uielement)
|
|
|
4171
4212
|
if (sortType==1)
|
|
4172
4213
|
{
|
|
4173
4214
|
if (rightValue<leftValue) return -1;
|
|
4174
|
-
else if (rightValue
|
|
4215
|
+
else if (rightValue>leftValue) return 1;
|
|
4175
4216
|
else return 0;
|
|
4176
4217
|
}
|
|
4177
4218
|
else
|
|
@@ -4196,7 +4237,7 @@ function JSReportChartContainer(uielement)
|
|
|
4196
4237
|
if (sortType==1)
|
|
4197
4238
|
{
|
|
4198
4239
|
if (rightValue<leftValue) return -1;
|
|
4199
|
-
else if (rightValue
|
|
4240
|
+
else if (rightValue>leftValue) return 1;
|
|
4200
4241
|
else return 0;
|
|
4201
4242
|
}
|
|
4202
4243
|
else
|
|
@@ -4221,7 +4262,7 @@ function JSReportChartContainer(uielement)
|
|
|
4221
4262
|
if (sortType==1)
|
|
4222
4263
|
{
|
|
4223
4264
|
if (rightValue<leftValue) return -1;
|
|
4224
|
-
else if (rightValue
|
|
4265
|
+
else if (rightValue>leftValue) return 1;
|
|
4225
4266
|
else return 0;
|
|
4226
4267
|
}
|
|
4227
4268
|
else
|
|
@@ -4367,6 +4367,18 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4367
4367
|
if (IFrameSplitOperator.IsBool(option.PauseUpdate)) chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;
|
|
4368
4368
|
}
|
|
4369
4369
|
|
|
4370
|
+
//缺口设置 KLine:{ PriceGap:{ Enable, Count } }
|
|
4371
|
+
this.SetPriceGapConfig=function(chart, option)
|
|
4372
|
+
{
|
|
4373
|
+
if (!option || !option.PriceGap) return;
|
|
4374
|
+
var klineChart=chart.ChartPaint[0];
|
|
4375
|
+
if (!klineChart) return;
|
|
4376
|
+
|
|
4377
|
+
var item=option.PriceGap;
|
|
4378
|
+
if (IFrameSplitOperator.IsBool(item.Enable)) klineChart.PriceGap.Enable=item.Enable;
|
|
4379
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) klineChart.PriceGap.Count=item.Count;
|
|
4380
|
+
}
|
|
4381
|
+
|
|
4370
4382
|
//历史K线图
|
|
4371
4383
|
this.CreateKLineChartContainer=function(option)
|
|
4372
4384
|
{
|
|
@@ -4719,14 +4731,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4719
4731
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4720
4732
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4721
4733
|
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
4722
|
-
if (item.PriceGap)
|
|
4723
|
-
{
|
|
4724
|
-
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
4725
|
-
if (IFrameSplitOperator.IsNumber(item.PriceGap.Count)) klineChart.PriceGap.Count=item.PriceGap.Count;
|
|
4726
|
-
}
|
|
4727
|
-
|
|
4728
4734
|
if (IFrameSplitOperator.IsBool(item.EnablePrediction)) klineChart.PredictionConfig.Enable=item.EnablePrediction;
|
|
4729
4735
|
if (IFrameSplitOperator.IsBool(item.EnableDaySummary)) klineChart.DaySummary.Enable=item.EnableDaySummary;
|
|
4736
|
+
|
|
4737
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
4730
4738
|
}
|
|
4731
4739
|
|
|
4732
4740
|
if(option.KLineTitle)
|
|
@@ -5742,6 +5750,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5742
5750
|
if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false;
|
|
5743
5751
|
if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition;
|
|
5744
5752
|
if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice;
|
|
5753
|
+
|
|
5754
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
5745
5755
|
}
|
|
5746
5756
|
|
|
5747
5757
|
if(option.KLineTitle) //股票名称 日期 周期
|
|
@@ -141550,6 +141560,21 @@ function JSReportChartContainer(uielement)
|
|
|
141550
141560
|
case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
|
|
141551
141561
|
|
|
141552
141562
|
return this.LocalNumberSort(left, right, column, sortType);
|
|
141563
|
+
|
|
141564
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME1_ID:
|
|
141565
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME2_ID:
|
|
141566
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME3_ID:
|
|
141567
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME4_ID:
|
|
141568
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME5_ID:
|
|
141569
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME6_ID:
|
|
141570
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME7_ID:
|
|
141571
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
141572
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
141573
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
141574
|
+
return this.LocalDateTimeSort(left, right, column, sortType);
|
|
141575
|
+
|
|
141576
|
+
|
|
141577
|
+
|
|
141553
141578
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
141554
141579
|
return this.LoacCustomNumberSort(left, right, column, sortType);
|
|
141555
141580
|
case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID: //自定义字符串字段
|
|
@@ -141633,7 +141658,7 @@ function JSReportChartContainer(uielement)
|
|
|
141633
141658
|
if (sortType==1)
|
|
141634
141659
|
{
|
|
141635
141660
|
if (rightValue<leftValue) return -1;
|
|
141636
|
-
else if (rightValue
|
|
141661
|
+
else if (rightValue>leftValue) return 1;
|
|
141637
141662
|
else return 0;
|
|
141638
141663
|
}
|
|
141639
141664
|
else
|
|
@@ -141656,12 +141681,38 @@ function JSReportChartContainer(uielement)
|
|
|
141656
141681
|
if (leftStock && IFrameSplitOperator.IsNumber(leftStock[filedName])) leftValue=leftStock[filedName];
|
|
141657
141682
|
if (rightStock && IFrameSplitOperator.IsNumber(rightStock[filedName])) rightValue=rightStock[filedName];
|
|
141658
141683
|
|
|
141659
|
-
|
|
141660
141684
|
|
|
141661
141685
|
if (sortType==1)
|
|
141662
141686
|
{
|
|
141663
141687
|
if (rightValue<leftValue) return -1;
|
|
141664
|
-
else if (rightValue
|
|
141688
|
+
else if (rightValue>leftValue) return 1;
|
|
141689
|
+
else return 0;
|
|
141690
|
+
}
|
|
141691
|
+
else
|
|
141692
|
+
{
|
|
141693
|
+
if (leftValue<rightValue) return -1;
|
|
141694
|
+
else if (leftValue>rightValue) return 1;
|
|
141695
|
+
else return 0;
|
|
141696
|
+
}
|
|
141697
|
+
}
|
|
141698
|
+
|
|
141699
|
+
//Date数据排序
|
|
141700
|
+
this.LocalDateTimeSort=function(left, right, column, sortType)
|
|
141701
|
+
{
|
|
141702
|
+
var leftStock=this.GetStockData(left);
|
|
141703
|
+
var rightStock=this.GetStockData(right);
|
|
141704
|
+
|
|
141705
|
+
var leftValue=new Date(0), rightValue=new Date(0);
|
|
141706
|
+
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
141707
|
+
|
|
141708
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141709
|
+
if (leftStock && leftStock[filedName]) leftValue=leftStock[filedName];
|
|
141710
|
+
if (rightStock && rightStock[filedName]) rightValue=rightStock[filedName];
|
|
141711
|
+
|
|
141712
|
+
if (sortType==1)
|
|
141713
|
+
{
|
|
141714
|
+
if (rightValue<leftValue) return -1;
|
|
141715
|
+
else if (rightValue>leftValue) return 1;
|
|
141665
141716
|
else return 0;
|
|
141666
141717
|
}
|
|
141667
141718
|
else
|
|
@@ -141686,7 +141737,7 @@ function JSReportChartContainer(uielement)
|
|
|
141686
141737
|
if (sortType==1)
|
|
141687
141738
|
{
|
|
141688
141739
|
if (rightValue<leftValue) return -1;
|
|
141689
|
-
else if (rightValue
|
|
141740
|
+
else if (rightValue>leftValue) return 1;
|
|
141690
141741
|
else return 0;
|
|
141691
141742
|
}
|
|
141692
141743
|
else
|
|
@@ -141711,7 +141762,7 @@ function JSReportChartContainer(uielement)
|
|
|
141711
141762
|
if (sortType==1)
|
|
141712
141763
|
{
|
|
141713
141764
|
if (rightValue<leftValue) return -1;
|
|
141714
|
-
else if (rightValue
|
|
141765
|
+
else if (rightValue>leftValue) return 1;
|
|
141715
141766
|
else return 0;
|
|
141716
141767
|
}
|
|
141717
141768
|
else
|
|
@@ -141736,7 +141787,7 @@ function JSReportChartContainer(uielement)
|
|
|
141736
141787
|
if (sortType==1)
|
|
141737
141788
|
{
|
|
141738
141789
|
if (rightValue<leftValue) return -1;
|
|
141739
|
-
else if (rightValue
|
|
141790
|
+
else if (rightValue>leftValue) return 1;
|
|
141740
141791
|
else return 0;
|
|
141741
141792
|
}
|
|
141742
141793
|
else
|
|
@@ -150737,7 +150788,7 @@ function ScrollBarBGChart()
|
|
|
150737
150788
|
|
|
150738
150789
|
|
|
150739
150790
|
|
|
150740
|
-
var HQCHART_VERSION="1.1.
|
|
150791
|
+
var HQCHART_VERSION="1.1.14887";
|
|
150741
150792
|
|
|
150742
150793
|
function PrintHQChartVersion()
|
|
150743
150794
|
{
|
|
@@ -4411,6 +4411,18 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4411
4411
|
if (IFrameSplitOperator.IsBool(option.PauseUpdate)) chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;
|
|
4412
4412
|
}
|
|
4413
4413
|
|
|
4414
|
+
//缺口设置 KLine:{ PriceGap:{ Enable, Count } }
|
|
4415
|
+
this.SetPriceGapConfig=function(chart, option)
|
|
4416
|
+
{
|
|
4417
|
+
if (!option || !option.PriceGap) return;
|
|
4418
|
+
var klineChart=chart.ChartPaint[0];
|
|
4419
|
+
if (!klineChart) return;
|
|
4420
|
+
|
|
4421
|
+
var item=option.PriceGap;
|
|
4422
|
+
if (IFrameSplitOperator.IsBool(item.Enable)) klineChart.PriceGap.Enable=item.Enable;
|
|
4423
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) klineChart.PriceGap.Count=item.Count;
|
|
4424
|
+
}
|
|
4425
|
+
|
|
4414
4426
|
//历史K线图
|
|
4415
4427
|
this.CreateKLineChartContainer=function(option)
|
|
4416
4428
|
{
|
|
@@ -4763,14 +4775,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4763
4775
|
if (IFrameSplitOperator.IsBool(item.IsShowMaxMinPrice)) klineChart.IsShowMaxMinPrice=item.IsShowMaxMinPrice;
|
|
4764
4776
|
if (IFrameSplitOperator.IsNumber(item.OneLimitBarType)) klineChart.OneLimitBarType=item.OneLimitBarType;
|
|
4765
4777
|
if (IFrameSplitOperator.IsNumber(item.UnchangeBarType)) klineChart.UnchangeBarType=item.UnchangeBarType;
|
|
4766
|
-
if (item.PriceGap)
|
|
4767
|
-
{
|
|
4768
|
-
if (IFrameSplitOperator.IsBool(item.PriceGap.Enable)) klineChart.PriceGap.Enable=item.PriceGap.Enable;
|
|
4769
|
-
if (IFrameSplitOperator.IsNumber(item.PriceGap.Count)) klineChart.PriceGap.Count=item.PriceGap.Count;
|
|
4770
|
-
}
|
|
4771
|
-
|
|
4772
4778
|
if (IFrameSplitOperator.IsBool(item.EnablePrediction)) klineChart.PredictionConfig.Enable=item.EnablePrediction;
|
|
4773
4779
|
if (IFrameSplitOperator.IsBool(item.EnableDaySummary)) klineChart.DaySummary.Enable=item.EnableDaySummary;
|
|
4780
|
+
|
|
4781
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
4774
4782
|
}
|
|
4775
4783
|
|
|
4776
4784
|
if(option.KLineTitle)
|
|
@@ -5786,6 +5794,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5786
5794
|
if (option.KLine.ShowKLine == false) chart.ChartPaint[0].IsShow = false;
|
|
5787
5795
|
if (option.KLine.InfoPosition>0) chart.ChartPaint[0].InfoPosition=option.KLine.InfoPosition;
|
|
5788
5796
|
if (option.KLine.IsShowMaxMinPrice == false) chart.ChartPaint[0].IsShowMaxMinPrice=option.KLine.IsShowMaxMinPrice;
|
|
5797
|
+
|
|
5798
|
+
this.SetPriceGapConfig(chart, option.KLine);
|
|
5789
5799
|
}
|
|
5790
5800
|
|
|
5791
5801
|
if(option.KLineTitle) //股票名称 日期 周期
|
|
@@ -141594,6 +141604,21 @@ function JSReportChartContainer(uielement)
|
|
|
141594
141604
|
case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
|
|
141595
141605
|
|
|
141596
141606
|
return this.LocalNumberSort(left, right, column, sortType);
|
|
141607
|
+
|
|
141608
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME1_ID:
|
|
141609
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME2_ID:
|
|
141610
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME3_ID:
|
|
141611
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME4_ID:
|
|
141612
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME5_ID:
|
|
141613
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME6_ID:
|
|
141614
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME7_ID:
|
|
141615
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
141616
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
141617
|
+
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
141618
|
+
return this.LocalDateTimeSort(left, right, column, sortType);
|
|
141619
|
+
|
|
141620
|
+
|
|
141621
|
+
|
|
141597
141622
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
141598
141623
|
return this.LoacCustomNumberSort(left, right, column, sortType);
|
|
141599
141624
|
case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID: //自定义字符串字段
|
|
@@ -141677,7 +141702,7 @@ function JSReportChartContainer(uielement)
|
|
|
141677
141702
|
if (sortType==1)
|
|
141678
141703
|
{
|
|
141679
141704
|
if (rightValue<leftValue) return -1;
|
|
141680
|
-
else if (rightValue
|
|
141705
|
+
else if (rightValue>leftValue) return 1;
|
|
141681
141706
|
else return 0;
|
|
141682
141707
|
}
|
|
141683
141708
|
else
|
|
@@ -141700,12 +141725,38 @@ function JSReportChartContainer(uielement)
|
|
|
141700
141725
|
if (leftStock && IFrameSplitOperator.IsNumber(leftStock[filedName])) leftValue=leftStock[filedName];
|
|
141701
141726
|
if (rightStock && IFrameSplitOperator.IsNumber(rightStock[filedName])) rightValue=rightStock[filedName];
|
|
141702
141727
|
|
|
141703
|
-
|
|
141704
141728
|
|
|
141705
141729
|
if (sortType==1)
|
|
141706
141730
|
{
|
|
141707
141731
|
if (rightValue<leftValue) return -1;
|
|
141708
|
-
else if (rightValue
|
|
141732
|
+
else if (rightValue>leftValue) return 1;
|
|
141733
|
+
else return 0;
|
|
141734
|
+
}
|
|
141735
|
+
else
|
|
141736
|
+
{
|
|
141737
|
+
if (leftValue<rightValue) return -1;
|
|
141738
|
+
else if (leftValue>rightValue) return 1;
|
|
141739
|
+
else return 0;
|
|
141740
|
+
}
|
|
141741
|
+
}
|
|
141742
|
+
|
|
141743
|
+
//Date数据排序
|
|
141744
|
+
this.LocalDateTimeSort=function(left, right, column, sortType)
|
|
141745
|
+
{
|
|
141746
|
+
var leftStock=this.GetStockData(left);
|
|
141747
|
+
var rightStock=this.GetStockData(right);
|
|
141748
|
+
|
|
141749
|
+
var leftValue=new Date(0), rightValue=new Date(0);
|
|
141750
|
+
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
141751
|
+
|
|
141752
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141753
|
+
if (leftStock && leftStock[filedName]) leftValue=leftStock[filedName];
|
|
141754
|
+
if (rightStock && rightStock[filedName]) rightValue=rightStock[filedName];
|
|
141755
|
+
|
|
141756
|
+
if (sortType==1)
|
|
141757
|
+
{
|
|
141758
|
+
if (rightValue<leftValue) return -1;
|
|
141759
|
+
else if (rightValue>leftValue) return 1;
|
|
141709
141760
|
else return 0;
|
|
141710
141761
|
}
|
|
141711
141762
|
else
|
|
@@ -141730,7 +141781,7 @@ function JSReportChartContainer(uielement)
|
|
|
141730
141781
|
if (sortType==1)
|
|
141731
141782
|
{
|
|
141732
141783
|
if (rightValue<leftValue) return -1;
|
|
141733
|
-
else if (rightValue
|
|
141784
|
+
else if (rightValue>leftValue) return 1;
|
|
141734
141785
|
else return 0;
|
|
141735
141786
|
}
|
|
141736
141787
|
else
|
|
@@ -141755,7 +141806,7 @@ function JSReportChartContainer(uielement)
|
|
|
141755
141806
|
if (sortType==1)
|
|
141756
141807
|
{
|
|
141757
141808
|
if (rightValue<leftValue) return -1;
|
|
141758
|
-
else if (rightValue
|
|
141809
|
+
else if (rightValue>leftValue) return 1;
|
|
141759
141810
|
else return 0;
|
|
141760
141811
|
}
|
|
141761
141812
|
else
|
|
@@ -141780,7 +141831,7 @@ function JSReportChartContainer(uielement)
|
|
|
141780
141831
|
if (sortType==1)
|
|
141781
141832
|
{
|
|
141782
141833
|
if (rightValue<leftValue) return -1;
|
|
141783
|
-
else if (rightValue
|
|
141834
|
+
else if (rightValue>leftValue) return 1;
|
|
141784
141835
|
else return 0;
|
|
141785
141836
|
}
|
|
141786
141837
|
else
|
|
@@ -161957,7 +162008,7 @@ function HQChartScriptWorker()
|
|
|
161957
162008
|
|
|
161958
162009
|
|
|
161959
162010
|
|
|
161960
|
-
var HQCHART_VERSION="1.1.
|
|
162011
|
+
var HQCHART_VERSION="1.1.14887";
|
|
161961
162012
|
|
|
161962
162013
|
function PrintHQChartVersion()
|
|
161963
162014
|
{
|