Merge branch 'release-3.8.0'

oat-sa · Sep 23, 2024 · 863c5c3 · 863c5c3
2 parents bdc902a + 0d29f39
commit 863c5c3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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": {

diff --git a/src/datatable.js b/src/datatable.js
@@ -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);

diff --git a/src/datatable/tpl/button.tpl b/src/datatable/tpl/button.tpl
@@ -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}}

diff --git a/src/datatable/tpl/layout.tpl b/src/datatable/tpl/layout.tpl
@@ -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}}
@@ -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}}