es-grid-template 1.7.28 → 1.7.30

package/lib/table-component/hook/utils.js

@@ -89,7 +89,7 @@ const getCommonPinningStyles = column => {
     // opacity: isPinned ? 0.5 : 1,
     opacity: 1,
     position: isPinned ? "sticky" : "relative",
-    width: column.getSize(),
+    // width: column.getSize(),
     zIndex: isPinned ? 2 : 0
     // border: '1px solid #e5e7eb',
     // borderTop: 0,
@@ -370,7 +370,7 @@ function getFixedFields(columns, type) {
   const result = [];
   function traverse(cols) {
     for (const col of cols) {
-      if ((col.fixed ?? col.fixedType) === type && col.field) {
+      if ((col.fixed ?? col.fixedType) === type && col.field && col.visible !== false) {
         result.push(col.field);
       }
       if (col.children && col.children.length > 0) {

package/lib/table-component/index.d.ts

@@ -1,5 +1,4 @@
 import InternalTable from './InternalTable';
-import type { ColumnsTable, TableProps, ColumnTable, CommandItem, ContextMenuItem } from './type';
-import type { ToolbarItem } from "rc-master-ui/es/toolbar";
-export type { ColumnsTable, TableProps, ColumnTable, ToolbarItem, CommandItem, ContextMenuItem };
+import type { ColumnsTable, TableProps, ColumnTable, ContextMenuItem } from './type';
+export type { ColumnsTable, TableProps, ColumnTable, ContextMenuItem };
 export default InternalTable;

package/lib/table-component/index.js

@@ -6,4 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _InternalTable = _interopRequireDefault(require("./InternalTable"));
+// import type {ToolbarItem} from "rc-master-ui/es/toolbar"
 var _default = exports.default = _InternalTable.default;

package/lib/table-component/style.scss

@@ -99,7 +99,7 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
       }
 
-    
+
 
       &.#{$prefix}-grid-cell-wrap {
         white-space: normal;
@@ -124,8 +124,10 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
 
     .#{$prefix}-grid-thead {
+      background-color: #ffffff;
 
       .#{$prefix}-grid-cell {
+        font-weight: 500;
 
         background-color: $body-color;
         // border-inline-end: 1px solid #e0e0e0;
@@ -260,13 +262,20 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
 
         background-color: $body-color;
 
-          &.#{$prefix}-grid-cell-ellipsis:not(:has(>.ui-rc_cell-content)) {
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        word-break: keep-all;
+        &.#{$prefix}-grid-cell-ellipsis:not(:has(>.ui-rc_cell-content)) {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          word-break: keep-all;
 
-      }
+
+
+        }
+
+        &.#{$prefix}-grid-cell-index-selected {
+          background-color: $cell-index-selected-bg;
+          color: #ffffff;
+        }
 
 
 
@@ -519,24 +528,26 @@ $fontFamily: "Montserrat", Helvetica, Arial, serif !default;
         }
 
 
-        // &.isValid {
-        //   &::after {
-        //     content: "";
-        //     position: absolute;
-        //     top: 0;
-        //     right: 0;
-        //     width: 0;
-        //     height: 0;
-        //     border-top: 0 solid transparent;
-        //     border-right: 8px solid red;
-        //     border-bottom: 8px solid transparent;
-        //   }
-        // }
+        .isValid {
+          &::after {
+            content: "";
+            position: absolute;
+            top: 0;
+            right: 0;
+            width: 0;
+            height: 0;
+            border-top: 0 solid transparent;
+            border-right: 8px solid red;
+            border-bottom: 8px solid transparent;
+          }
+        }
       }
 
     }
 
     .#{$prefix}-grid-tfoot {
+      background-color: rgb(250, 250, 250);
+
       .#{$prefix}-grid-cell {
         background-color: $body-color;
         border-inline-end: 1px solid $tableBorderColor;

package/lib/table-component/table/Grid.js

@@ -44,7 +44,9 @@ const Grid = props => {
     onSorter,
     onFilter,
     groupColumns,
-    height = 700,
+    // height= 700,
+    height,
+    minHeight,
     editAble,
     triggerChangeColumns,
     infiniteScroll,
@@ -208,7 +210,7 @@ const Grid = props => {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: `${prefix}-grid`,
     style: {
-      // height: height ?? undefined
+      minHeight: minHeight ?? undefined,
       maxHeight: height ?? undefined
     }
   }, /*#__PURE__*/_react.default.createElement(_core.DndContext, {
@@ -227,7 +229,8 @@ const Grid = props => {
     setIsSelectionChange: setIsSelectionChange,
     setSorterChange: setSorterChange,
     setFilterChange: setFilterChange,
-    height: height,
+    height: minHeight ?? height ?? 700,
+    minHeight: minHeight,
     pagination: pagination,
     columns: columns,
     propsColumns: propsColumns,

package/lib/table-component/table/TableWrapper.d.ts

@@ -8,6 +8,7 @@ type Props<T> = {
     id: string;
     tableContainerRef: React.RefObject<HTMLDivElement>;
     height: number;
+    minHeight?: number;
     table: Table<T>;
     summary?: boolean;
     loading?: boolean;

package/lib/table-component/table/TableWrapper.js

@@ -22,6 +22,7 @@ const TableWrapper = props => {
     prefix,
     tableContainerRef,
     height,
+    minHeight,
     summary,
     table,
     loading,
@@ -189,7 +190,9 @@ const TableWrapper = props => {
       position: 'relative',
       //needed for sticky header
       // height: tableHeight ?? '500px' //should be a fixed height
-      maxHeight: height //should be a fixed height
+      maxHeight: height,
+      //should be a fixed height
+      height: minHeight ? height : undefined //should be a fixed height
       // minWidth: table.getTotalSize()
     }
     // onScroll={infiniteScroll ? handleScroll : undefined}
@@ -238,6 +241,12 @@ const TableWrapper = props => {
       zIndex: 1999,
       maxWidth: 450
     }
+  }), /*#__PURE__*/_react.default.createElement(_reactTooltip.Tooltip, {
+    id: `${id}-tooltip-error`,
+    style: {
+      zIndex: 1999,
+      maxWidth: 450
+    }
   }), menuVisible && /*#__PURE__*/_react.default.createElement(_ContextMenu.default, {
     open: menuVisible,
     pos: position,

package/lib/table-component/type.d.ts

@@ -186,6 +186,7 @@ export type TableProps<RecordType = AnyObject> = {
     dataSource: RecordType[];
     columns: ColumnsTable<RecordType>;
     height?: number;
+    minHeight?: number;
     format?: IFormat;
     t?: any;
     lang?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.7.28",
+  "version": "1.7.30",
   "description": "es-grid-template",
   "keywords": [
     "react",