@clake/react-bootstrap4-window 1.2.5 → 1.2.7

package/lib/CTable.js

@@ -1,6 +1,6 @@
-/* @clake/react-bootstrap4-window v1.2.5 | by Clake
+/* @clake/react-bootstrap4-window v1.2.7 | by Clake
  * Copyright (c) 2025 Clake,
- * 2025-10-30T16:38:43+0800
+ * 2025-11-14T13:58:13+0800
  */
 "use strict";
 
@@ -519,6 +519,14 @@ function (_React$Component) {
         return true;
       }
 
+      if (this.props.edit !== nextProps.edit) {
+        return true;
+      }
+
+      if (this.props.select !== nextProps.select) {
+        return true;
+      }
+
       return nextState.data !== this.state.data;
     }
   }, {
@@ -1308,7 +1316,7 @@ function (_React$Component) {
         style: this.getTableStyles(null)
       }, _react["default"].createElement("thead", {
         className: this.getHeaderClasses()
-      }, _react["default"].createElement("tr", null, this.state.select || this.props.edit ? _react["default"].createElement("th", {
+      }, _react["default"].createElement("tr", null, this.props.select || this.props.edit ? _react["default"].createElement("th", {
         style: {
           width: '20px',
           textAlign: 'center'
@@ -1322,12 +1330,7 @@ function (_React$Component) {
         onChange: this.selectAll,
         checked: this.state.selectAll,
         half: this.state.selectHalf
-      })) : null, this.props.edit && !this.props.nodel ? _react["default"].createElement("th", {
-        style: {
-          width: '20px',
-          textAlign: 'center'
-        }
-      }) : null, _react["default"].Children.map(this.props.children, function (item, key) {
+      })) : null, _react["default"].Children.map(this.props.children, function (item, key) {
         var _ref, _item$props;
 
         _this13.cacheRow[item.props.field] = (_ref = (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.def) !== null && _ref !== void 0 ? _ref : '';
@@ -1371,7 +1374,12 @@ function (_React$Component) {
           "data-key": _this13.domId + '-' + key,
           className: "ck-column-split"
         }) : null);
-      })))));
+      }), this.props.edit && !this.props.nodel ? _react["default"].createElement("th", {
+        style: {
+          width: '20px',
+          textAlign: 'center'
+        }
+      }) : null))));
     }
   }, {
     key: "renderRows",
@@ -1411,7 +1419,7 @@ function (_React$Component) {
       return _react["default"].createElement(_react["default"].Fragment, null, _react["default"].createElement("tr", {
         className: rowClass,
         onClick: this.clickHandler(row, i)
-      }, this.state.select ? _react["default"].createElement("th", {
+      }, this.props.select ? _react["default"].createElement("th", {
         style: {
           width: '20px',
           textAlign: 'center'
@@ -1513,20 +1521,7 @@ function (_React$Component) {
         id: "".concat(this.domId, "-edit-row-icon-").concat(i),
         icon: "edit",
         className: this.props.disabled ? 'text-secondary' : 'text-success'
-      })), !this.props.nodel ? _react["default"].createElement("th", {
-        style: {
-          width: '20px',
-          textAlign: 'center',
-          cursor: 'pointer'
-        }
-      }, _react["default"].createElement(_reactBootstrap.Icon, {
-        icon: "trash",
-        className: this.props.disabled ? 'text-secondary' : 'text-danger',
-        text: "delete",
-        onClick: function onClick() {
-          _this16.deleteRowHandler(i);
-        }
-      })) : null, _react["default"].Children.map(this.props.children, function (item, key) {
+      })), _react["default"].Children.map(this.props.children, function (item, key) {
         if (!item || item.props.hide) {
           return null;
         } //set style
@@ -1559,7 +1554,20 @@ function (_React$Component) {
           },
           "data-row": "".concat(i)
         }, item.props.disabled ? item.props.onFormat ? item.props.onFormat(row[item.props.field], row, item.props.field) : row[item.props.field] : _this16.renderEditComponent(item.props, row, i));
-      })));
+      }), !this.props.nodel ? _react["default"].createElement("th", {
+        style: {
+          width: '20px',
+          textAlign: 'center',
+          cursor: 'pointer'
+        }
+      }, _react["default"].createElement(_reactBootstrap.Icon, {
+        icon: "trash",
+        className: this.props.disabled ? 'text-secondary' : 'text-danger',
+        text: "delete",
+        onClick: function onClick() {
+          _this16.deleteRowHandler(i);
+        }
+      })) : null));
     }
   }, {
     key: "renderEditAddRow",
@@ -1724,6 +1732,7 @@ function (_React$Component) {
       }
 
       var total = this.state.total;
+      var fields = this.props.totalFields;
       return _react["default"].createElement("div", {
         ref: function ref(c) {
           return _this20.tableTotal = c;
@@ -1736,16 +1745,11 @@ function (_React$Component) {
         id: "table-total-".concat(this.domId),
         className: this.getClasses(),
         style: this.getTableStyles()
-      }, _react["default"].createElement("tbody", null, _react["default"].createElement("tr", null, this.state.select || this.props.edit ? _react["default"].createElement("td", {
+      }, _react["default"].createElement("tbody", null, _react["default"].createElement("tr", null, this.props.select || this.props.edit ? _react["default"].createElement("td", {
         width: "20px"
       }, _react["default"].createElement(_reactBootstrap.Icon, {
         icon: "chart-line"
-      })) : null, !this.props.nodel && this.props.edit ? _react["default"].createElement("td", {
-        style: {
-          width: '20px',
-          textAlign: 'center'
-        }
-      }) : null, _react["default"].Children.map(this.props.children, function (item, key) {
+      })) : null, _react["default"].Children.map(this.props.children, function (item, key) {
         if (!item || item.props.hide) {
           return null;
         }
@@ -1759,12 +1763,25 @@ function (_React$Component) {
           style.width = item.props.width;
         }
 
+        if (fields && !fields.includes(item.props.field) || !total[item.props.field]) {
+          return _react["default"].createElement("td", {
+            id: _this20.domId + '-' + key,
+            "data-field": item.props.field,
+            style: style
+          });
+        }
+
         return _react["default"].createElement("td", {
           id: _this20.domId + '-' + key,
           "data-field": item.props.field,
           style: style
         }, item.props.onFormat ? item.props.onFormat(total[item.props.field], total, item.props.field) : total[item.props.field]);
-      })))));
+      }), !this.props.nodel && this.props.edit ? _react["default"].createElement("td", {
+        style: {
+          width: '20px',
+          textAlign: 'center'
+        }
+      }) : null))));
     }
   }, {
     key: "renderMenu",