hqchart 1.1.14885 → 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
CHANGED
|
@@ -13564,9 +13564,10 @@ if(event&&event.Callback){var data={PreventDefault:false,CommandID:cmdID,Args:ar
|
|
|
13564
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)//去掉排序
|
|
13565
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();}};//本地排序
|
|
13566
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://期货字段
|
|
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.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://自定义数值字段
|
|
13568
13568
|
return this.LoacCustomNumberSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID://自定义字符串字段
|
|
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
|
|
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',//类名::函数名
|
|
13570
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:'(报价列表股票排序数据)不提供内置测试数据' };
|
|
13571
13572
|
};this.RecvStockSortData=function(data){var chart=this.ChartPaint[0];if(!chart)return;var selectedSymbol=chart.GetSelectedSingleSymbol();//更新股票数据
|
|
13572
13573
|
var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){for(var i=0;i<data.data.length;++i){var item=data.data[i];//数据
|
|
@@ -15171,7 +15172,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15171
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);};}/********************************************************************************
|
|
15172
15173
|
* 版本信息输出
|
|
15173
15174
|
*
|
|
15174
|
-
*/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();//把给外界调用的方法暴露出来
|
|
15175
15176
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15176
15177
|
// BaseIndex:BaseIndex,
|
|
15177
15178
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -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
|
|
@@ -141560,6 +141560,21 @@ function JSReportChartContainer(uielement)
|
|
|
141560
141560
|
case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
|
|
141561
141561
|
|
|
141562
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
|
+
|
|
141563
141578
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
141564
141579
|
return this.LoacCustomNumberSort(left, right, column, sortType);
|
|
141565
141580
|
case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID: //自定义字符串字段
|
|
@@ -141643,7 +141658,7 @@ function JSReportChartContainer(uielement)
|
|
|
141643
141658
|
if (sortType==1)
|
|
141644
141659
|
{
|
|
141645
141660
|
if (rightValue<leftValue) return -1;
|
|
141646
|
-
else if (rightValue
|
|
141661
|
+
else if (rightValue>leftValue) return 1;
|
|
141647
141662
|
else return 0;
|
|
141648
141663
|
}
|
|
141649
141664
|
else
|
|
@@ -141666,12 +141681,38 @@ function JSReportChartContainer(uielement)
|
|
|
141666
141681
|
if (leftStock && IFrameSplitOperator.IsNumber(leftStock[filedName])) leftValue=leftStock[filedName];
|
|
141667
141682
|
if (rightStock && IFrameSplitOperator.IsNumber(rightStock[filedName])) rightValue=rightStock[filedName];
|
|
141668
141683
|
|
|
141669
|
-
|
|
141670
141684
|
|
|
141671
141685
|
if (sortType==1)
|
|
141672
141686
|
{
|
|
141673
141687
|
if (rightValue<leftValue) return -1;
|
|
141674
|
-
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;
|
|
141675
141716
|
else return 0;
|
|
141676
141717
|
}
|
|
141677
141718
|
else
|
|
@@ -141696,7 +141737,7 @@ function JSReportChartContainer(uielement)
|
|
|
141696
141737
|
if (sortType==1)
|
|
141697
141738
|
{
|
|
141698
141739
|
if (rightValue<leftValue) return -1;
|
|
141699
|
-
else if (rightValue
|
|
141740
|
+
else if (rightValue>leftValue) return 1;
|
|
141700
141741
|
else return 0;
|
|
141701
141742
|
}
|
|
141702
141743
|
else
|
|
@@ -141721,7 +141762,7 @@ function JSReportChartContainer(uielement)
|
|
|
141721
141762
|
if (sortType==1)
|
|
141722
141763
|
{
|
|
141723
141764
|
if (rightValue<leftValue) return -1;
|
|
141724
|
-
else if (rightValue
|
|
141765
|
+
else if (rightValue>leftValue) return 1;
|
|
141725
141766
|
else return 0;
|
|
141726
141767
|
}
|
|
141727
141768
|
else
|
|
@@ -141746,7 +141787,7 @@ function JSReportChartContainer(uielement)
|
|
|
141746
141787
|
if (sortType==1)
|
|
141747
141788
|
{
|
|
141748
141789
|
if (rightValue<leftValue) return -1;
|
|
141749
|
-
else if (rightValue
|
|
141790
|
+
else if (rightValue>leftValue) return 1;
|
|
141750
141791
|
else return 0;
|
|
141751
141792
|
}
|
|
141752
141793
|
else
|
|
@@ -150747,7 +150788,7 @@ function ScrollBarBGChart()
|
|
|
150747
150788
|
|
|
150748
150789
|
|
|
150749
150790
|
|
|
150750
|
-
var HQCHART_VERSION="1.1.
|
|
150791
|
+
var HQCHART_VERSION="1.1.14887";
|
|
150751
150792
|
|
|
150752
150793
|
function PrintHQChartVersion()
|
|
150753
150794
|
{
|
|
@@ -141604,6 +141604,21 @@ function JSReportChartContainer(uielement)
|
|
|
141604
141604
|
case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
|
|
141605
141605
|
|
|
141606
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
|
+
|
|
141607
141622
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
141608
141623
|
return this.LoacCustomNumberSort(left, right, column, sortType);
|
|
141609
141624
|
case REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID: //自定义字符串字段
|
|
@@ -141687,7 +141702,7 @@ function JSReportChartContainer(uielement)
|
|
|
141687
141702
|
if (sortType==1)
|
|
141688
141703
|
{
|
|
141689
141704
|
if (rightValue<leftValue) return -1;
|
|
141690
|
-
else if (rightValue
|
|
141705
|
+
else if (rightValue>leftValue) return 1;
|
|
141691
141706
|
else return 0;
|
|
141692
141707
|
}
|
|
141693
141708
|
else
|
|
@@ -141710,12 +141725,38 @@ function JSReportChartContainer(uielement)
|
|
|
141710
141725
|
if (leftStock && IFrameSplitOperator.IsNumber(leftStock[filedName])) leftValue=leftStock[filedName];
|
|
141711
141726
|
if (rightStock && IFrameSplitOperator.IsNumber(rightStock[filedName])) rightValue=rightStock[filedName];
|
|
141712
141727
|
|
|
141713
|
-
|
|
141714
141728
|
|
|
141715
141729
|
if (sortType==1)
|
|
141716
141730
|
{
|
|
141717
141731
|
if (rightValue<leftValue) return -1;
|
|
141718
|
-
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;
|
|
141719
141760
|
else return 0;
|
|
141720
141761
|
}
|
|
141721
141762
|
else
|
|
@@ -141740,7 +141781,7 @@ function JSReportChartContainer(uielement)
|
|
|
141740
141781
|
if (sortType==1)
|
|
141741
141782
|
{
|
|
141742
141783
|
if (rightValue<leftValue) return -1;
|
|
141743
|
-
else if (rightValue
|
|
141784
|
+
else if (rightValue>leftValue) return 1;
|
|
141744
141785
|
else return 0;
|
|
141745
141786
|
}
|
|
141746
141787
|
else
|
|
@@ -141765,7 +141806,7 @@ function JSReportChartContainer(uielement)
|
|
|
141765
141806
|
if (sortType==1)
|
|
141766
141807
|
{
|
|
141767
141808
|
if (rightValue<leftValue) return -1;
|
|
141768
|
-
else if (rightValue
|
|
141809
|
+
else if (rightValue>leftValue) return 1;
|
|
141769
141810
|
else return 0;
|
|
141770
141811
|
}
|
|
141771
141812
|
else
|
|
@@ -141790,7 +141831,7 @@ function JSReportChartContainer(uielement)
|
|
|
141790
141831
|
if (sortType==1)
|
|
141791
141832
|
{
|
|
141792
141833
|
if (rightValue<leftValue) return -1;
|
|
141793
|
-
else if (rightValue
|
|
141834
|
+
else if (rightValue>leftValue) return 1;
|
|
141794
141835
|
else return 0;
|
|
141795
141836
|
}
|
|
141796
141837
|
else
|
|
@@ -161967,7 +162008,7 @@ function HQChartScriptWorker()
|
|
|
161967
162008
|
|
|
161968
162009
|
|
|
161969
162010
|
|
|
161970
|
-
var HQCHART_VERSION="1.1.
|
|
162011
|
+
var HQCHART_VERSION="1.1.14887";
|
|
161971
162012
|
|
|
161972
162013
|
function PrintHQChartVersion()
|
|
161973
162014
|
{
|