This commit is contained in:
2023-03-16 21:58:34 +00:00
parent 1cf637698e
commit 5561826960
177 changed files with 358 additions and 295 deletions
@@ -511,6 +511,7 @@ var Unibase;
var instance = this;
instance.DatasetTooltips = [];
if (instance.toolTipArray.length > 0) {
instance.toolTipArray.sort((x, y) => Number(x.Index) - Number(y.Index));
for (var i = 0; i < instance.toolTipArray.length; i++) {
var tooltiparr = instance.toolTipArray[i];
let Labelarr = [];
@@ -2007,11 +2008,12 @@ var Unibase;
prepareAndBindToolTipColumns(ChartColumns) {
let tooltipColumns = ChartColumns.filter(x => x.IsToolTip);
let cols = this.getReportColumns();
for (var i = 0; i < tooltipColumns.length; i++) {
var tCols = tooltipColumns.sort((x, y) => Number(x.ToolTipIndex) - Number(y.ToolTipIndex));
for (var i = 0; i < tCols.length; i++) {
let idx = cols.findIndex(x => x.AliasName == tooltipColumns[i].AliasName);
if (idx > -1) {
let col = cols[idx];
this.toolTipArray.push({ ColumnValue: col.ColumnValue, ColumnName: col.ReportColumnName, DisplayText: col.DisplayText, AliasName: col.AliasName, Index: col.ColumnIndex });
this.toolTipArray.push({ ColumnValue: col.ColumnValue, ColumnName: col.ReportColumnName, DisplayText: col.DisplayText, AliasName: col.AliasName, Index: tooltipColumns[i].ToolTipIndex });
if (this._reportBuilder.isEdit) {
var html = this._reportBuilderTemplate.loadToolTipColumn(col.ReportColumnId, col.AliasName, col.DataType, col.DisplayText);
$("#tab_tooltip #tooltip_selected_columns").append(html);