change
This commit is contained in:
@@ -590,6 +590,7 @@ var Unibase;
|
||||
$("#dynFilParentProperty_AutoComplete").val(dynamicfilters[0].ParentColumn).trigger("change");
|
||||
$("#dynFilApplyFor_AutoComplete").val(dynamicfilters[0].ApplyFor).trigger("change");
|
||||
}
|
||||
$('#dataList_AutoComplete').attr('disabled', 'true');
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
@@ -332,14 +332,19 @@ var Unibase;
|
||||
instance.fileCacheHelper.loadJsFile("libs/pivottable/js/pivot.js", function () {
|
||||
var rptRowCols = [];
|
||||
var rptColumnCols = [];
|
||||
let rptDisplayTexts = [];
|
||||
if (instance._reportBuilder.ReportColumns.length != 0) {
|
||||
for (var p = 0; p < instance._reportBuilder.ReportColumns.length; p++) {
|
||||
if (instance._reportBuilder.ReportColumns[p].IsPivotTableCol) {
|
||||
rptColumnCols.push("" + instance._reportBuilder.ReportColumns[p].AliasName + "");
|
||||
const { IsPivotTableCol, AliasName, DisplayText, ReportColumnId, Isvisible } = instance._reportBuilder.ReportColumns[p];
|
||||
if (IsPivotTableCol) {
|
||||
rptColumnCols.push(AliasName);
|
||||
}
|
||||
else {
|
||||
rptRowCols.push("" + instance._reportBuilder.ReportColumns[p].AliasName + "");
|
||||
else if (Isvisible) {
|
||||
rptRowCols.push(AliasName);
|
||||
}
|
||||
rptDisplayTexts[AliasName] = {
|
||||
ReportColumnId, DisplayText
|
||||
};
|
||||
}
|
||||
}
|
||||
let containerEl = $("#tabulatorReportbuilder");
|
||||
@@ -350,14 +355,33 @@ var Unibase;
|
||||
rendererName: "Table",
|
||||
onRefresh: function (config) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
const pvtUnusedList = [];
|
||||
containerEl.find('.pvtUnused .pvtAttr').each(function (i, e) {
|
||||
pvtUnusedList.push($(e).contents().get(0).nodeValue);
|
||||
var hiddencol_index = instance._reportBuilder.getIndexByAliasName_selectedColumnsArray($(e).contents().get(0).nodeValue);
|
||||
containerEl.find('.pvtAxisLabel').each(function (i, e) {
|
||||
const aliasName = $(e).contents().get(0).nodeValue;
|
||||
$(e).contents().get(0).nodeValue = rptDisplayTexts[aliasName].DisplayText;
|
||||
$(e).attr('id', `pvtAxisLabel_${aliasName}`);
|
||||
});
|
||||
containerEl.find('.pvtAttr').each(function (i, e) {
|
||||
const aliasName = $(e).find('.pvtDisplayText').attr('data-aliasname');
|
||||
const isUnused = $(e).closest('.pvtUnused').length;
|
||||
const isRowCol = $(e).closest('.pvtRows').length;
|
||||
var hiddencol_index = instance._reportBuilder.getIndexByAliasName_selectedColumnsArray(aliasName);
|
||||
const selectedColumn = instance._reportBuilder.selectedColumns[hiddencol_index];
|
||||
if (hiddencol_index > -1) {
|
||||
instance._reportBuilder.selectedColumns[hiddencol_index].Isvisible = false;
|
||||
if (isUnused || isRowCol) {
|
||||
if (isUnused) {
|
||||
selectedColumn.Isvisible = false;
|
||||
}
|
||||
else {
|
||||
selectedColumn.Isvisible = true;
|
||||
}
|
||||
selectedColumn.IsPivotTableCol = false;
|
||||
}
|
||||
}
|
||||
});
|
||||
containerEl.find('.pvtRows,.pvtCols').find('.pvtDisplayText').addClass('hidden');
|
||||
containerEl.find('.pvtRows,.pvtCols').find('.pvtDisplayTextInput').removeClass('hidden');
|
||||
containerEl.find('.pvtUnused .pvtDisplayText').removeClass('hidden');
|
||||
containerEl.find('.pvtUnused .pvtDisplayTextInput').addClass('hidden');
|
||||
for (var c = 0; c < config.cols.length; c++) {
|
||||
var index = instance._reportBuilder.getIndexByAliasName_selectedColumnsArray(config.cols[c]);
|
||||
if (index > -1) {
|
||||
@@ -375,7 +399,7 @@ var Unibase;
|
||||
}
|
||||
});
|
||||
instance._reportBuilder.EditableTabulatorTitle();
|
||||
containerEl.find('.pvtAttr').append('<span></span>');
|
||||
instance.appendInputToPivotRows(rptDisplayTexts);
|
||||
containerEl.addClass('pivot-ui-tableview');
|
||||
containerEl.find('button').each(function (i, e) {
|
||||
if ($(e).text().toLowerCase().includes('cancel')) {
|
||||
@@ -388,6 +412,16 @@ var Unibase;
|
||||
});
|
||||
});
|
||||
}
|
||||
appendInputToPivotRows(rptDisplayTexts) {
|
||||
$("#tabulatorReportbuilder .pvtAttr").contents().filter(function () {
|
||||
return this.nodeType === Node.TEXT_NODE;
|
||||
}).each(function (i, el) {
|
||||
const aliasName = $(el).text();
|
||||
const isUsedCol = $(el).closest('.pvtRows,.pvtCols').length;
|
||||
const { ReportColumnId, DisplayText } = rptDisplayTexts[aliasName];
|
||||
$(el).after(`<span class="pvtDisplayText ${isUsedCol ? 'hidden' : ''}" data-aliasname=${aliasName}>${DisplayText}</span><input type="text" value="${DisplayText}" class="pvtDisplayTextInput ${!isUsedCol ? 'hidden' : ''}" id="pvtDisplayTextInput_${aliasName}" onchange="Unibase.Platform.Analytics.Reports.ReportBuilder.Instance().changeDisplayText_table(${ReportColumnId},'${aliasName}')"/>`).remove();
|
||||
});
|
||||
}
|
||||
getPivotAggregationTypeId(aggrName) {
|
||||
var aggrtypeid = 0;
|
||||
var instance = this;
|
||||
|
||||
@@ -1101,8 +1101,10 @@ var Unibase;
|
||||
rowClick: function (e, row) {
|
||||
},
|
||||
cellClick: function (e, cell) {
|
||||
var Interval = cell["_cell"].column.definition.title;
|
||||
Unibase.Platform.Analytics.Reports.Tenure.Instance().tenureDetailsTable(Interval);
|
||||
if ($(cell.getElement()).closest('.tabulator-footer').length === 0) {
|
||||
var Interval = cell["_cell"].column.definition.title;
|
||||
Unibase.Platform.Analytics.Reports.Tenure.Instance().tenureDetailsTable(Interval);
|
||||
}
|
||||
},
|
||||
placeholder: "No data available",
|
||||
columnResized: function (column) {
|
||||
@@ -1509,13 +1511,29 @@ var Unibase;
|
||||
}
|
||||
changeDisplayText_table(columnId, aliasName) {
|
||||
var instance = this;
|
||||
let displayText = $("[tabulator-field = '" + aliasName + "']").find(".tabulator-title-editor").val().toString();
|
||||
let displayText = '';
|
||||
let isPivotTable = false;
|
||||
const containerEl = $('#tabulatorReportbuilder');
|
||||
if (containerEl.find('.pvtUi').length !== 0) {
|
||||
isPivotTable = true;
|
||||
}
|
||||
if (isPivotTable) {
|
||||
displayText = containerEl.find(`#pvtDisplayTextInput_${aliasName}`).val().toString();
|
||||
}
|
||||
else {
|
||||
displayText = $(`[tabulator-field='${aliasName}'] .tabulator-title-editor`).val().toString();
|
||||
}
|
||||
if (displayText) {
|
||||
let sIndex = instance.getIndexByAliasName_selectedColumnsArray(aliasName);
|
||||
if (sIndex > -1) {
|
||||
instance.selectedColumns[sIndex].DisplayText = displayText;
|
||||
$(".tabulator-col-title").find("#DisplayText_" + aliasName).val(displayText);
|
||||
$(".tabulator-col-title").find("#DisplayText_" + aliasName).focus();
|
||||
if (isPivotTable) {
|
||||
containerEl.find(`#pvtAxisLabel_${aliasName}`).contents().get(0).nodeValue = displayText;
|
||||
}
|
||||
else {
|
||||
$(".tabulator-col-title").find("#DisplayText_" + aliasName).val(displayText);
|
||||
$(".tabulator-col-title").find("#DisplayText_" + aliasName).focus();
|
||||
}
|
||||
$("#selectedColumns #column_" + aliasName + "_block").find(".dsl-block-name").text(displayText);
|
||||
}
|
||||
let xIdx = this._chartBuilder.xaxisColumns.findIndex(x => x.AliasName == aliasName);
|
||||
|
||||
@@ -47,7 +47,7 @@ var Unibase;
|
||||
loadToolTipColumn(ColumnId, AliasName, DataType, DisplayText) {
|
||||
let tooltipHtml = `<div class="dsl-block datagroup inline-edit" id="dsl_tool_column_${AliasName}">
|
||||
<span>
|
||||
<i class="las la-braille dragger hidden"></i>
|
||||
<i class="las la-braille dragger mr-1"></i>
|
||||
<div class="dsl-block-name position-relative flex-grow-1 mw-100">
|
||||
<input type="text" id="txttooltipedit" required="required" value="${DisplayText}" class="edit text-truncate" disabled>
|
||||
<button type="reset" title="Click me to clear the input field" class="btn btn-icon btn-flush-biz-theme btn-rounded flush-soft-hover d-20 reset-text hidden reset-text hidden" onclick ="Unibase.Platform.Analytics.Charts.ChartBuilder.Instance().toolTipEdit('${AliasName}')"><span class="btn-icon-wrap"><i class="icon dripicons-cross"></i></span></button>
|
||||
|
||||
Reference in New Issue
Block a user