hqchart 1.1.14888 → 1.1.14896
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
|
@@ -13400,8 +13400,9 @@ this.RequestStockData=function(arySymbol){var self=this;if(this.NetworkFilter){v
|
|
|
13400
13400
|
Explain:'报价列表股票数据',Request:{Data:{stocks:arySymbol},symbol:this.Symbol,name:this.Name},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.RecvStockData(data);self.AutoUpdate();});if(obj.PreventDefault==true)return;}//throw { Name:'JSReportChartContainer::RequestStockData', Error:'(报价列表股票数据)不提供内置测试数据' };
|
|
13401
13401
|
};this.RecvStockData=function(data){var _this63=this;var setUpdateSymbol=new _set2.default();//更新的股票列表
|
|
13402
13402
|
if(IFrameSplitOperator.IsNonEmptyArray(data.data)){//0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本
|
|
13403
|
-
for(var i=0;i<data.data.length;++i){var item=data.data[i];var symbol=item[0];if(!symbol)continue;var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;stock.Symbol=this.GetSymbolNoSuffix(symbol);this.MapStockData.set(symbol,stock);}this.ReadStockJsonData(stock,item);if(!setUpdateSymbol.has(symbol))setUpdateSymbol.add(symbol);}}
|
|
13404
|
-
|
|
13403
|
+
for(var i=0;i<data.data.length;++i){var item=data.data[i];var symbol=item[0];if(!symbol)continue;var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;stock.Symbol=this.GetSymbolNoSuffix(symbol);this.MapStockData.set(symbol,stock);}this.ReadStockJsonData(stock,item);if(!setUpdateSymbol.has(symbol))setUpdateSymbol.add(symbol);}}//重新更新板块成员
|
|
13404
|
+
if(IFrameSplitOperator.IsNonEmptyArray(data.members)){this.SourceData.Data=[];this.Data.Data=[];var aryMember=data.members;for(var i=0;i<aryMember.length;++i){var value=aryMember[i];this.Data.Data.push(value);this.SourceData.Data.push(value);}}var chart=this.ChartPaint[0];if(!chart)return;var bUpdate=false;//实时本地数据排序
|
|
13405
|
+
var chart=this.ChartPaint[0];if(chart&&(this.SortInfo.Sort==1||this.SortInfo.Sort==2)&&IFrameSplitOperator.IsNumber(this.SortInfo.Field)&&this.SortInfo.Field>=0){var column=chart.Column[this.SortInfo.Field];var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);if(event&&event.Callback){var sendData={Column:column,SortInfo:this.SortInfo,SymbolList:this.Data.Data,Result:null};event.Callback(event,sendData,this);if(Array.isArray(sendData.Result))this.Data.Data=sendData.Result;}else{this.Data.Data.sort(function(left,right){return _this63.LocalSort(left,right,column,_this63.SortInfo.Sort);});}bUpdate=true;//排序暂时每次都刷新
|
|
13405
13406
|
}else{//更新的股票在当前页面,需要重绘
|
|
13406
13407
|
var aryStock=chart.ShowSymbol;for(var i=0;i<aryStock.length;++i){if(setUpdateSymbol.has(aryStock[i].Symbol)){bUpdate=true;break;}}}if(bUpdate)this.Draw();};//读取单条股票json数据
|
|
13407
13408
|
this.ReadStockJsonData=function(stock,item){//0=证券代码 1=股票名称 2=昨收 3=开 4=高 5=低 6=收 7=成交量 8=成交金额, 9=买价 10=买量 11=卖价 12=卖量 13=均价 14=流通股 15=总股本 16=涨停价 17=跌停价
|
|
@@ -13564,10 +13565,10 @@ if(event&&event.Callback){var data={PreventDefault:false,CommandID:cmdID,Args:ar
|
|
|
13564
13565
|
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
13566
|
{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
13567
|
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.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.
|
|
13568
|
+
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.LocalReserveDateTimeSort(left,right,column,sortType);case REPORT_COLUMN_ID.RESERVE_STRING1_ID:case REPORT_COLUMN_ID.RESERVE_STRING2_ID:case REPORT_COLUMN_ID.RESERVE_STRING3_ID:case REPORT_COLUMN_ID.RESERVE_STRING4_ID:case REPORT_COLUMN_ID.RESERVE_STRING5_ID:case REPORT_COLUMN_ID.RESERVE_STRING6_ID:case REPORT_COLUMN_ID.RESERVE_STRING7_ID:case REPORT_COLUMN_ID.RESERVE_STRING8_ID:case REPORT_COLUMN_ID.RESERVE_STRING9_ID:case REPORT_COLUMN_ID.RESERVE_STRING10_ID:return this.LocalReserveStringSort(left,right,column,sortType);case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID://自定义数值字段
|
|
13568
13569
|
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>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.
|
|
13570
|
+
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.LocalReserveStringSort=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]){var value=leftStock[filedName];if(IFrameSplitOperator.IsObject(value))leftValue=value.Text;else leftValue=value;}if(rightStock&&rightStock[filedName]){var value=rightStock[filedName];if(IFrameSplitOperator.IsObject(value))rightValue=value.Text;else 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.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数据排序
|
|
13571
|
+
this.LocalReserveDateTimeSort=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]){var value=leftStock[filedName];if(value.DateTime)leftValue=value.DateTime;}if(rightStock&&rightStock[filedName]){var value=rightStock[filedName];if(value.DateTime)rightValue=value.DateTime;}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',//类名::函数名
|
|
13571
13572
|
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:'(报价列表股票排序数据)不提供内置测试数据' };
|
|
13572
13573
|
};this.RecvStockSortData=function(data){var chart=this.ChartPaint[0];if(!chart)return;var selectedSymbol=chart.GetSelectedSingleSymbol();//更新股票数据
|
|
13573
13574
|
var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){for(var i=0;i<data.data.length;++i){var item=data.data[i];//数据
|
|
@@ -15172,7 +15173,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15172
15173
|
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);};}/********************************************************************************
|
|
15173
15174
|
* 版本信息输出
|
|
15174
15175
|
*
|
|
15175
|
-
*/var HQCHART_VERSION="1.1.
|
|
15176
|
+
*/var HQCHART_VERSION="1.1.14895";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();//把给外界调用的方法暴露出来
|
|
15176
15177
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15177
15178
|
// BaseIndex:BaseIndex,
|
|
15178
15179
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -1584,13 +1584,27 @@ function JSReportChartContainer(uielement)
|
|
|
1584
1584
|
}
|
|
1585
1585
|
}
|
|
1586
1586
|
|
|
1587
|
+
//重新更新板块成员
|
|
1588
|
+
if (IFrameSplitOperator.IsNonEmptyArray(data.members))
|
|
1589
|
+
{
|
|
1590
|
+
this.SourceData.Data=[];
|
|
1591
|
+
this.Data.Data=[];
|
|
1592
|
+
var aryMember=data.members;
|
|
1593
|
+
for(var i=0;i<aryMember.length;++i)
|
|
1594
|
+
{
|
|
1595
|
+
var value=aryMember[i];
|
|
1596
|
+
this.Data.Data.push(value);
|
|
1597
|
+
this.SourceData.Data.push(value);
|
|
1598
|
+
}
|
|
1599
|
+
}
|
|
1600
|
+
|
|
1587
1601
|
var chart=this.ChartPaint[0];
|
|
1588
1602
|
if (!chart) return;
|
|
1589
1603
|
|
|
1590
1604
|
var bUpdate=false;
|
|
1591
1605
|
//实时本地数据排序
|
|
1592
1606
|
var chart=this.ChartPaint[0];
|
|
1593
|
-
if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
1607
|
+
if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
1594
1608
|
{
|
|
1595
1609
|
var column=chart.Column[this.SortInfo.Field];
|
|
1596
1610
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
|
|
@@ -4046,8 +4060,19 @@ function JSReportChartContainer(uielement)
|
|
|
4046
4060
|
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
4047
4061
|
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
4048
4062
|
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
4049
|
-
return this.
|
|
4050
|
-
|
|
4063
|
+
return this.LocalReserveDateTimeSort(left, right, column, sortType);
|
|
4064
|
+
|
|
4065
|
+
case REPORT_COLUMN_ID.RESERVE_STRING1_ID:
|
|
4066
|
+
case REPORT_COLUMN_ID.RESERVE_STRING2_ID:
|
|
4067
|
+
case REPORT_COLUMN_ID.RESERVE_STRING3_ID:
|
|
4068
|
+
case REPORT_COLUMN_ID.RESERVE_STRING4_ID:
|
|
4069
|
+
case REPORT_COLUMN_ID.RESERVE_STRING5_ID:
|
|
4070
|
+
case REPORT_COLUMN_ID.RESERVE_STRING6_ID:
|
|
4071
|
+
case REPORT_COLUMN_ID.RESERVE_STRING7_ID:
|
|
4072
|
+
case REPORT_COLUMN_ID.RESERVE_STRING8_ID:
|
|
4073
|
+
case REPORT_COLUMN_ID.RESERVE_STRING9_ID:
|
|
4074
|
+
case REPORT_COLUMN_ID.RESERVE_STRING10_ID:
|
|
4075
|
+
return this.LocalReserveStringSort(left, right, column, sortType);
|
|
4051
4076
|
|
|
4052
4077
|
|
|
4053
4078
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
@@ -4144,6 +4169,48 @@ function JSReportChartContainer(uielement)
|
|
|
4144
4169
|
}
|
|
4145
4170
|
}
|
|
4146
4171
|
|
|
4172
|
+
|
|
4173
|
+
this.LocalReserveStringSort=function(left, right, column, sortType)
|
|
4174
|
+
{
|
|
4175
|
+
var leftStock=this.GetStockData(left);
|
|
4176
|
+
var rightStock=this.GetStockData(right);
|
|
4177
|
+
|
|
4178
|
+
var leftValue="", rightValue="";
|
|
4179
|
+
if (sortType==2)
|
|
4180
|
+
{
|
|
4181
|
+
leftValue="啊啊啊啊啊";
|
|
4182
|
+
rightValue="啊啊啊啊啊";
|
|
4183
|
+
}
|
|
4184
|
+
|
|
4185
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
4186
|
+
if (leftStock && leftStock[filedName])
|
|
4187
|
+
{
|
|
4188
|
+
var value=leftStock[filedName];
|
|
4189
|
+
if (IFrameSplitOperator.IsObject(value)) leftValue=value.Text;
|
|
4190
|
+
else leftValue=value;
|
|
4191
|
+
}
|
|
4192
|
+
|
|
4193
|
+
if (rightStock && rightStock[filedName])
|
|
4194
|
+
{
|
|
4195
|
+
var value=rightStock[filedName];
|
|
4196
|
+
if (IFrameSplitOperator.IsObject(value)) rightValue=value.Text;
|
|
4197
|
+
else rightValue=value;
|
|
4198
|
+
}
|
|
4199
|
+
|
|
4200
|
+
if (sortType==1)
|
|
4201
|
+
{
|
|
4202
|
+
if (rightValue<leftValue) return -1;
|
|
4203
|
+
else if (rightValue>leftValue) return 1;
|
|
4204
|
+
else return 0;
|
|
4205
|
+
}
|
|
4206
|
+
else
|
|
4207
|
+
{
|
|
4208
|
+
if (leftValue<rightValue) return -1;
|
|
4209
|
+
else if (leftValue>rightValue) return 1;
|
|
4210
|
+
else return 0;
|
|
4211
|
+
}
|
|
4212
|
+
}
|
|
4213
|
+
|
|
4147
4214
|
this.LocalNumberSort=function(left, right, column, sortType)
|
|
4148
4215
|
{
|
|
4149
4216
|
var leftStock=this.GetStockData(left);
|
|
@@ -4172,7 +4239,7 @@ function JSReportChartContainer(uielement)
|
|
|
4172
4239
|
}
|
|
4173
4240
|
|
|
4174
4241
|
//Date数据排序
|
|
4175
|
-
this.
|
|
4242
|
+
this.LocalReserveDateTimeSort=function(left, right, column, sortType)
|
|
4176
4243
|
{
|
|
4177
4244
|
var leftStock=this.GetStockData(left);
|
|
4178
4245
|
var rightStock=this.GetStockData(right);
|
|
@@ -4181,8 +4248,16 @@ function JSReportChartContainer(uielement)
|
|
|
4181
4248
|
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
4182
4249
|
|
|
4183
4250
|
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
4184
|
-
if (leftStock && leftStock[filedName])
|
|
4185
|
-
|
|
4251
|
+
if (leftStock && leftStock[filedName])
|
|
4252
|
+
{
|
|
4253
|
+
var value=leftStock[filedName];
|
|
4254
|
+
if (value.DateTime) leftValue=value.DateTime;
|
|
4255
|
+
}
|
|
4256
|
+
if (rightStock && rightStock[filedName])
|
|
4257
|
+
{
|
|
4258
|
+
var value=rightStock[filedName];
|
|
4259
|
+
if (value.DateTime) rightValue=value.DateTime;
|
|
4260
|
+
}
|
|
4186
4261
|
|
|
4187
4262
|
if (sortType==1)
|
|
4188
4263
|
{
|
|
@@ -139109,13 +139109,27 @@ function JSReportChartContainer(uielement)
|
|
|
139109
139109
|
}
|
|
139110
139110
|
}
|
|
139111
139111
|
|
|
139112
|
+
//重新更新板块成员
|
|
139113
|
+
if (IFrameSplitOperator.IsNonEmptyArray(data.members))
|
|
139114
|
+
{
|
|
139115
|
+
this.SourceData.Data=[];
|
|
139116
|
+
this.Data.Data=[];
|
|
139117
|
+
var aryMember=data.members;
|
|
139118
|
+
for(var i=0;i<aryMember.length;++i)
|
|
139119
|
+
{
|
|
139120
|
+
var value=aryMember[i];
|
|
139121
|
+
this.Data.Data.push(value);
|
|
139122
|
+
this.SourceData.Data.push(value);
|
|
139123
|
+
}
|
|
139124
|
+
}
|
|
139125
|
+
|
|
139112
139126
|
var chart=this.ChartPaint[0];
|
|
139113
139127
|
if (!chart) return;
|
|
139114
139128
|
|
|
139115
139129
|
var bUpdate=false;
|
|
139116
139130
|
//实时本地数据排序
|
|
139117
139131
|
var chart=this.ChartPaint[0];
|
|
139118
|
-
if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
139132
|
+
if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
139119
139133
|
{
|
|
139120
139134
|
var column=chart.Column[this.SortInfo.Field];
|
|
139121
139135
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
|
|
@@ -141571,8 +141585,19 @@ function JSReportChartContainer(uielement)
|
|
|
141571
141585
|
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
141572
141586
|
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
141573
141587
|
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
141574
|
-
return this.
|
|
141575
|
-
|
|
141588
|
+
return this.LocalReserveDateTimeSort(left, right, column, sortType);
|
|
141589
|
+
|
|
141590
|
+
case REPORT_COLUMN_ID.RESERVE_STRING1_ID:
|
|
141591
|
+
case REPORT_COLUMN_ID.RESERVE_STRING2_ID:
|
|
141592
|
+
case REPORT_COLUMN_ID.RESERVE_STRING3_ID:
|
|
141593
|
+
case REPORT_COLUMN_ID.RESERVE_STRING4_ID:
|
|
141594
|
+
case REPORT_COLUMN_ID.RESERVE_STRING5_ID:
|
|
141595
|
+
case REPORT_COLUMN_ID.RESERVE_STRING6_ID:
|
|
141596
|
+
case REPORT_COLUMN_ID.RESERVE_STRING7_ID:
|
|
141597
|
+
case REPORT_COLUMN_ID.RESERVE_STRING8_ID:
|
|
141598
|
+
case REPORT_COLUMN_ID.RESERVE_STRING9_ID:
|
|
141599
|
+
case REPORT_COLUMN_ID.RESERVE_STRING10_ID:
|
|
141600
|
+
return this.LocalReserveStringSort(left, right, column, sortType);
|
|
141576
141601
|
|
|
141577
141602
|
|
|
141578
141603
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
@@ -141669,6 +141694,48 @@ function JSReportChartContainer(uielement)
|
|
|
141669
141694
|
}
|
|
141670
141695
|
}
|
|
141671
141696
|
|
|
141697
|
+
|
|
141698
|
+
this.LocalReserveStringSort=function(left, right, column, sortType)
|
|
141699
|
+
{
|
|
141700
|
+
var leftStock=this.GetStockData(left);
|
|
141701
|
+
var rightStock=this.GetStockData(right);
|
|
141702
|
+
|
|
141703
|
+
var leftValue="", rightValue="";
|
|
141704
|
+
if (sortType==2)
|
|
141705
|
+
{
|
|
141706
|
+
leftValue="啊啊啊啊啊";
|
|
141707
|
+
rightValue="啊啊啊啊啊";
|
|
141708
|
+
}
|
|
141709
|
+
|
|
141710
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141711
|
+
if (leftStock && leftStock[filedName])
|
|
141712
|
+
{
|
|
141713
|
+
var value=leftStock[filedName];
|
|
141714
|
+
if (IFrameSplitOperator.IsObject(value)) leftValue=value.Text;
|
|
141715
|
+
else leftValue=value;
|
|
141716
|
+
}
|
|
141717
|
+
|
|
141718
|
+
if (rightStock && rightStock[filedName])
|
|
141719
|
+
{
|
|
141720
|
+
var value=rightStock[filedName];
|
|
141721
|
+
if (IFrameSplitOperator.IsObject(value)) rightValue=value.Text;
|
|
141722
|
+
else rightValue=value;
|
|
141723
|
+
}
|
|
141724
|
+
|
|
141725
|
+
if (sortType==1)
|
|
141726
|
+
{
|
|
141727
|
+
if (rightValue<leftValue) return -1;
|
|
141728
|
+
else if (rightValue>leftValue) return 1;
|
|
141729
|
+
else return 0;
|
|
141730
|
+
}
|
|
141731
|
+
else
|
|
141732
|
+
{
|
|
141733
|
+
if (leftValue<rightValue) return -1;
|
|
141734
|
+
else if (leftValue>rightValue) return 1;
|
|
141735
|
+
else return 0;
|
|
141736
|
+
}
|
|
141737
|
+
}
|
|
141738
|
+
|
|
141672
141739
|
this.LocalNumberSort=function(left, right, column, sortType)
|
|
141673
141740
|
{
|
|
141674
141741
|
var leftStock=this.GetStockData(left);
|
|
@@ -141697,7 +141764,7 @@ function JSReportChartContainer(uielement)
|
|
|
141697
141764
|
}
|
|
141698
141765
|
|
|
141699
141766
|
//Date数据排序
|
|
141700
|
-
this.
|
|
141767
|
+
this.LocalReserveDateTimeSort=function(left, right, column, sortType)
|
|
141701
141768
|
{
|
|
141702
141769
|
var leftStock=this.GetStockData(left);
|
|
141703
141770
|
var rightStock=this.GetStockData(right);
|
|
@@ -141706,8 +141773,16 @@ function JSReportChartContainer(uielement)
|
|
|
141706
141773
|
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
141707
141774
|
|
|
141708
141775
|
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141709
|
-
if (leftStock && leftStock[filedName])
|
|
141710
|
-
|
|
141776
|
+
if (leftStock && leftStock[filedName])
|
|
141777
|
+
{
|
|
141778
|
+
var value=leftStock[filedName];
|
|
141779
|
+
if (value.DateTime) leftValue=value.DateTime;
|
|
141780
|
+
}
|
|
141781
|
+
if (rightStock && rightStock[filedName])
|
|
141782
|
+
{
|
|
141783
|
+
var value=rightStock[filedName];
|
|
141784
|
+
if (value.DateTime) rightValue=value.DateTime;
|
|
141785
|
+
}
|
|
141711
141786
|
|
|
141712
141787
|
if (sortType==1)
|
|
141713
141788
|
{
|
|
@@ -150788,7 +150863,7 @@ function ScrollBarBGChart()
|
|
|
150788
150863
|
|
|
150789
150864
|
|
|
150790
150865
|
|
|
150791
|
-
var HQCHART_VERSION="1.1.
|
|
150866
|
+
var HQCHART_VERSION="1.1.14895";
|
|
150792
150867
|
|
|
150793
150868
|
function PrintHQChartVersion()
|
|
150794
150869
|
{
|
|
@@ -139153,13 +139153,27 @@ function JSReportChartContainer(uielement)
|
|
|
139153
139153
|
}
|
|
139154
139154
|
}
|
|
139155
139155
|
|
|
139156
|
+
//重新更新板块成员
|
|
139157
|
+
if (IFrameSplitOperator.IsNonEmptyArray(data.members))
|
|
139158
|
+
{
|
|
139159
|
+
this.SourceData.Data=[];
|
|
139160
|
+
this.Data.Data=[];
|
|
139161
|
+
var aryMember=data.members;
|
|
139162
|
+
for(var i=0;i<aryMember.length;++i)
|
|
139163
|
+
{
|
|
139164
|
+
var value=aryMember[i];
|
|
139165
|
+
this.Data.Data.push(value);
|
|
139166
|
+
this.SourceData.Data.push(value);
|
|
139167
|
+
}
|
|
139168
|
+
}
|
|
139169
|
+
|
|
139156
139170
|
var chart=this.ChartPaint[0];
|
|
139157
139171
|
if (!chart) return;
|
|
139158
139172
|
|
|
139159
139173
|
var bUpdate=false;
|
|
139160
139174
|
//实时本地数据排序
|
|
139161
139175
|
var chart=this.ChartPaint[0];
|
|
139162
|
-
if (chart && this.SortInfo.Sort==1 && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
139176
|
+
if (chart && (this.SortInfo.Sort==1 || this.SortInfo.Sort==2) && IFrameSplitOperator.IsNumber(this.SortInfo.Field) && this.SortInfo.Field>=0)
|
|
139163
139177
|
{
|
|
139164
139178
|
var column=chart.Column[this.SortInfo.Field];
|
|
139165
139179
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_LOCAL_SORT);
|
|
@@ -141615,8 +141629,19 @@ function JSReportChartContainer(uielement)
|
|
|
141615
141629
|
case REPORT_COLUMN_ID.RESERVE_DATETIME8_ID:
|
|
141616
141630
|
case REPORT_COLUMN_ID.RESERVE_DATETIME9_ID:
|
|
141617
141631
|
case REPORT_COLUMN_ID.RESERVE_DATETIME10_ID:
|
|
141618
|
-
return this.
|
|
141619
|
-
|
|
141632
|
+
return this.LocalReserveDateTimeSort(left, right, column, sortType);
|
|
141633
|
+
|
|
141634
|
+
case REPORT_COLUMN_ID.RESERVE_STRING1_ID:
|
|
141635
|
+
case REPORT_COLUMN_ID.RESERVE_STRING2_ID:
|
|
141636
|
+
case REPORT_COLUMN_ID.RESERVE_STRING3_ID:
|
|
141637
|
+
case REPORT_COLUMN_ID.RESERVE_STRING4_ID:
|
|
141638
|
+
case REPORT_COLUMN_ID.RESERVE_STRING5_ID:
|
|
141639
|
+
case REPORT_COLUMN_ID.RESERVE_STRING6_ID:
|
|
141640
|
+
case REPORT_COLUMN_ID.RESERVE_STRING7_ID:
|
|
141641
|
+
case REPORT_COLUMN_ID.RESERVE_STRING8_ID:
|
|
141642
|
+
case REPORT_COLUMN_ID.RESERVE_STRING9_ID:
|
|
141643
|
+
case REPORT_COLUMN_ID.RESERVE_STRING10_ID:
|
|
141644
|
+
return this.LocalReserveStringSort(left, right, column, sortType);
|
|
141620
141645
|
|
|
141621
141646
|
|
|
141622
141647
|
case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID: //自定义数值字段
|
|
@@ -141713,6 +141738,48 @@ function JSReportChartContainer(uielement)
|
|
|
141713
141738
|
}
|
|
141714
141739
|
}
|
|
141715
141740
|
|
|
141741
|
+
|
|
141742
|
+
this.LocalReserveStringSort=function(left, right, column, sortType)
|
|
141743
|
+
{
|
|
141744
|
+
var leftStock=this.GetStockData(left);
|
|
141745
|
+
var rightStock=this.GetStockData(right);
|
|
141746
|
+
|
|
141747
|
+
var leftValue="", rightValue="";
|
|
141748
|
+
if (sortType==2)
|
|
141749
|
+
{
|
|
141750
|
+
leftValue="啊啊啊啊啊";
|
|
141751
|
+
rightValue="啊啊啊啊啊";
|
|
141752
|
+
}
|
|
141753
|
+
|
|
141754
|
+
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141755
|
+
if (leftStock && leftStock[filedName])
|
|
141756
|
+
{
|
|
141757
|
+
var value=leftStock[filedName];
|
|
141758
|
+
if (IFrameSplitOperator.IsObject(value)) leftValue=value.Text;
|
|
141759
|
+
else leftValue=value;
|
|
141760
|
+
}
|
|
141761
|
+
|
|
141762
|
+
if (rightStock && rightStock[filedName])
|
|
141763
|
+
{
|
|
141764
|
+
var value=rightStock[filedName];
|
|
141765
|
+
if (IFrameSplitOperator.IsObject(value)) rightValue=value.Text;
|
|
141766
|
+
else rightValue=value;
|
|
141767
|
+
}
|
|
141768
|
+
|
|
141769
|
+
if (sortType==1)
|
|
141770
|
+
{
|
|
141771
|
+
if (rightValue<leftValue) return -1;
|
|
141772
|
+
else if (rightValue>leftValue) return 1;
|
|
141773
|
+
else return 0;
|
|
141774
|
+
}
|
|
141775
|
+
else
|
|
141776
|
+
{
|
|
141777
|
+
if (leftValue<rightValue) return -1;
|
|
141778
|
+
else if (leftValue>rightValue) return 1;
|
|
141779
|
+
else return 0;
|
|
141780
|
+
}
|
|
141781
|
+
}
|
|
141782
|
+
|
|
141716
141783
|
this.LocalNumberSort=function(left, right, column, sortType)
|
|
141717
141784
|
{
|
|
141718
141785
|
var leftStock=this.GetStockData(left);
|
|
@@ -141741,7 +141808,7 @@ function JSReportChartContainer(uielement)
|
|
|
141741
141808
|
}
|
|
141742
141809
|
|
|
141743
141810
|
//Date数据排序
|
|
141744
|
-
this.
|
|
141811
|
+
this.LocalReserveDateTimeSort=function(left, right, column, sortType)
|
|
141745
141812
|
{
|
|
141746
141813
|
var leftStock=this.GetStockData(left);
|
|
141747
141814
|
var rightStock=this.GetStockData(right);
|
|
@@ -141750,8 +141817,16 @@ function JSReportChartContainer(uielement)
|
|
|
141750
141817
|
if (sortType==2) leftValue=rightValue=Date(2999, 12, 30);
|
|
141751
141818
|
|
|
141752
141819
|
var filedName=MAP_COLUMN_FIELD.get(column.Type);
|
|
141753
|
-
if (leftStock && leftStock[filedName])
|
|
141754
|
-
|
|
141820
|
+
if (leftStock && leftStock[filedName])
|
|
141821
|
+
{
|
|
141822
|
+
var value=leftStock[filedName];
|
|
141823
|
+
if (value.DateTime) leftValue=value.DateTime;
|
|
141824
|
+
}
|
|
141825
|
+
if (rightStock && rightStock[filedName])
|
|
141826
|
+
{
|
|
141827
|
+
var value=rightStock[filedName];
|
|
141828
|
+
if (value.DateTime) rightValue=value.DateTime;
|
|
141829
|
+
}
|
|
141755
141830
|
|
|
141756
141831
|
if (sortType==1)
|
|
141757
141832
|
{
|
|
@@ -162008,7 +162083,7 @@ function HQChartScriptWorker()
|
|
|
162008
162083
|
|
|
162009
162084
|
|
|
162010
162085
|
|
|
162011
|
-
var HQCHART_VERSION="1.1.
|
|
162086
|
+
var HQCHART_VERSION="1.1.14895";
|
|
162012
162087
|
|
|
162013
162088
|
function PrintHQChartVersion()
|
|
162014
162089
|
{
|