@pdg/react-table 1.0.13 → 1.0.15

package/dist/index.js

@@ -8343,7 +8343,7 @@ var equal = function (v1, v2) {
 var TableCommonCell = function (_a) {
     var children = _a.children, initClassName = _a.className, initStyle = _a.style, initSx = _a.sx, type = _a.type, column = _a.column, defaultAlign = _a.defaultAlign, initDefaultEllipsis = _a.defaultEllipsis, index = _a.index, item = _a.item, onClick = _a.onClick;
     var align = React.useMemo(function () { return getTableColumnAlign(column, defaultAlign); }, [column, defaultAlign]);
-    var ellipsis = React.useMemo(function () { return (column.ellipsis != null ? column.ellipsis : !!initDefaultEllipsis); }, [column, initDefaultEllipsis]);
+    var ellipsis = React.useMemo(function () { return type !== 'head' && (column.ellipsis != null ? column.ellipsis : !!initDefaultEllipsis); }, [type, column, initDefaultEllipsis]);
     var className = React.useMemo(function () {
         var _a, _b, _c, _d, _e, _f;
         var className;
@@ -8852,25 +8852,25 @@ var Table = React__default["default"].forwardRef(function (_a, ref) {
     var simpleBarStyle = React.useMemo(function () {
         if (fullHeight) {
             return {
-                height: (containerHeight || 0) - (pagingHeight || 0),
+                height: (containerHeight || 0) - (pagingHeight || 0) - 2,
                 flex: 1,
                 position: 'absolute',
+                top: 1,
                 left: 0,
                 right: 0,
-                marginBottom: pagingHeight,
+                marginBottom: pagingHeight || 0,
             };
         }
         else {
-            return { height: height, minHeight: minHeight, maxHeight: maxHeight };
+            return { height: height, minHeight: minHeight, maxHeight: maxHeight, marginBottom: -1 };
         }
     }, [containerHeight, fullHeight, height, maxHeight, minHeight, pagingHeight]);
     var pagingStyle = React.useMemo(function () {
+        var style = { padding: '13px 0', borderTop: '1px solid rgba(224, 224, 224, 1)' };
         if (fullHeight) {
-            return { position: 'sticky', padding: '13px 0' };
-        }
-        else {
-            return { padding: '13px 0' };
+            return __assign$1({ position: 'sticky' }, style);
         }
+        return style;
     }, [fullHeight]);
     // Render ----------------------------------------------------------------------------------------------------------
     return finalColumns ? (React__default["default"].createElement(material.Paper, { ref: fullHeight ? containerHeightDetector : undefined, className: classNames('Table', className), variant: 'outlined', style: style, sx: sx },
@@ -8891,9 +8891,9 @@ var Table = React__default["default"].forwardRef(function (_a, ref) {
 });
 Table.displayName = 'Table';
 Table.defaultProps = TableDefaultProps;var SearchTableDefaultProps = {};var SearchTable = React__default["default"].forwardRef(function (_a, ref) {
-    var color = _a.color, hash = _a.hash, search = _a.search, table = _a.table, betweenSearchTableComponent = _a.betweenSearchTableComponent, onGetData = _a.onGetData, onRequestHashChange = _a.onRequestHashChange, 
+    var color = _a.color, hash = _a.hash, fullHeight = _a.fullHeight, search = _a.search, table = _a.table, betweenSearchTableComponent = _a.betweenSearchTableComponent, onGetData = _a.onGetData, onRequestHashChange = _a.onRequestHashChange, 
     // ---------------------------------------------------------------------------------------------------------------
-    className = _a.className, style = _a.style, sx = _a.sx;
+    className = _a.className, initStyle = _a.style, sx = _a.sx;
     var searchRef = React.useRef();
     var tableRef = React.useRef();
     //------------------------------------------------------------------------------------------------------------------
@@ -9174,6 +9174,20 @@ Table.defaultProps = TableDefaultProps;var SearchTableDefaultProps = {};var Sear
             }
         }
     }, [searchRef, hash, hashChange, getData, isFirstSearchSubmit]);
+    // Memo --------------------------------------------------------------------------------------------------------------
+    var style = React.useMemo(function () {
+        if (fullHeight) {
+            return __assign$1(__assign$1({}, initStyle), { flex: 1, display: 'flex' });
+        }
+        else {
+            return initStyle;
+        }
+    }, [initStyle, fullHeight]);
+    var tableContainerStyle = React.useMemo(function () {
+        if (fullHeight) {
+            return { flex: 1, display: 'flex', flexDirection: 'column' };
+        }
+    }, [fullHeight]);
     //------------------------------------------------------------------------------------------------------------------
     return (React__default["default"].createElement(material.Grid, { container: true, direction: 'column', spacing: 1, className: classNames('SearchTable', className), style: style, sx: sx },
         React__default["default"].createElement(material.Grid, { item: true, sx: { display: searchInfo.searchGroups ? undefined : 'none' } },
@@ -9192,8 +9206,8 @@ Table.defaultProps = TableDefaultProps;var SearchTableDefaultProps = {};var Sear
                     React__default["default"].createElement(reactForm.FormHidden, { name: 'page', value: 1 })),
                 searchInfo.searchGroups)),
         betweenSearchTableComponent && React__default["default"].createElement(material.Grid, { item: true }, betweenSearchTableComponent),
-        React__default["default"].createElement(material.Grid, { item: true },
-            React__default["default"].createElement(Table, __assign$1({}, tableInfo.props, { ref: function (commands) {
+        React__default["default"].createElement(material.Grid, { item: true, style: tableContainerStyle },
+            React__default["default"].createElement(Table, __assign$1({}, tableInfo.props, { fullHeight: fullHeight, ref: function (commands) {
                     if (tableInfo.ref) {
                         if (typeof tableInfo.ref === 'function') {
                             tableInfo.ref(commands);