From a59fe95e64e050ead3ef101b662b5b45adc89f09 Mon Sep 17 00:00:00 2001 From: Alexandra Romanenko Date: Fri, 4 Oct 2024 17:10:23 +0300 Subject: [PATCH 1/2] FIO-8234/FIO-7195: Fixes an issue where value properties are shown instead of labels for Select component with Resource/URL data sources in DataTable --- lib/mjs/package.json | 3 --- src/templates/bootstrap4/tbody/html.ejs | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 lib/mjs/package.json diff --git a/lib/mjs/package.json b/lib/mjs/package.json deleted file mode 100644 index 96ae6e57..00000000 --- a/lib/mjs/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "type": "module" -} \ No newline at end of file diff --git a/src/templates/bootstrap4/tbody/html.ejs b/src/templates/bootstrap4/tbody/html.ejs index bdaa75d3..61480f49 100644 --- a/src/templates/bootstrap4/tbody/html.ejs +++ b/src/templates/bootstrap4/tbody/html.ejs @@ -9,10 +9,10 @@ {% } %} {% row.forEach(function(rowComp) { %} {% if (rowComp.component.show) { %} - - {{ ctx.instance.hook('format', rowComp.component.key, rowComp.dataValue) }} + {{ ctx.instance.hook('format', rowComp.component.key, rowComp.dataValue, rowComp.rowIndex) }} {% } %} {% }); %} @@ -44,4 +44,4 @@ {% }); %} - \ No newline at end of file + From fcd4fbb5ac6e0018fc9855511150a9ff1b150b0b Mon Sep 17 00:00:00 2001 From: Alexandra Romanenko Date: Tue, 8 Oct 2024 16:17:05 +0300 Subject: [PATCH 2/2] Removed accidential change --- lib/mjs/package.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lib/mjs/package.json diff --git a/lib/mjs/package.json b/lib/mjs/package.json new file mode 100644 index 00000000..96ae6e57 --- /dev/null +++ b/lib/mjs/package.json @@ -0,0 +1,3 @@ +{ + "type": "module" +} \ No newline at end of file