Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.8.0 #604

Merged
merged 4 commits into from
Sep 23, 2024
Merged

Release 3.8.0 #604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77b69d0
feat: forward a CSS class for the datatable action buttons
jsconan Sep 18, 2024
0d6d19f
feat: forward the CSS class to the action buttons in the datatable la…
jsconan Sep 18, 2024
d77bc34
Merge pull request #603 from oat-sa/feature/ADF-1782/styled-datatable…
jsconan Sep 23, 2024
0d29f39
chore: bump version
oat-github-bot Sep 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oat-sa/tao-core-ui",
"version": "3.7.0",
"version": "3.8.0",
"displayName": "TAO Core UI",
"description": "UI libraries of TAO",
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/datatable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,8 @@ const dataTable = {
const disabled = getPropertyValue('disabled', action, nextData);
const icon = getPropertyValue('icon', action, nextData);
const label = getPropertyValue('label', action, nextData);
const $actionButton = $(buttonTpl({ id, icon, label, title, disabled }));
const cls = getPropertyValue('cls', action, nextData);
const $actionButton = $(buttonTpl({ id, icon, label, title, disabled, cls }));

if (!hidden) {
$actionCell.append('\n').append($actionButton);
Expand Down
2 changes: 1 addition & 1 deletion src/datatable/tpl/button.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<button class="btn-info small {{id}}"
<button class="btn-info small {{cls}} {{id}}"
{{#if title}} title="{{title}}"{{/if}}
{{#if disabled}} disabled="disabled"{{/if}}>
{{#if icon}}<span class="icon-{{icon}}"></span>{{/if}}
Expand Down
4 changes: 2 additions & 2 deletions src/datatable/tpl/layout.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
{{#if id}}
{{#with ../../../../this}}
{{#unless ../hidden}}
<button class="btn-info small {{../../id}}"
<button class="btn-info small {{../../cls}} {{../../id}}"
{{#if ../../title}} title="{{../../../title}}"{{/if}}
{{#if ../../disabled}} disabled="disabled"{{/if}}>
{{#if ../../icon}}<span class="icon-{{../../../icon}}"></span>{{/if}}
Expand Down Expand Up @@ -128,7 +128,7 @@
{{#if id}}
{{#with ../../../this}}
{{#unless ../hidden}}
<button class="btn-info small {{../../id}}"
<button class="btn-info small {{../../cls}} {{../../id}}"
{{#if ../../title}} title="{{../../../title}}"{{/if}}
{{#if ../../disabled}} disabled="disabled"{{/if}}>
{{#if ../../icon}}<span class="icon-{{../../../icon}}"></span>{{/if}}
Expand Down
Loading