es-grid-template 1.1.8 → 1.2.1

package/es/grid-component/index.js

@@ -1,2 +1,4 @@
+// import ConvertColumnTable  from './ConvertColumnTable'
 import InternalTable from "./InternalTable";
-export default InternalTable;
+export default InternalTable;
+// export default ConvertColumnTable

package/es/grid-component/styles.scss

@@ -7,6 +7,7 @@ $rowSelectedBg: #FEF2EF !default;
 $tableBorderColor: #e0e0e0 !default;
 //$tableBorderColor: #f0f0f0 !default;
 $border-radius: 6px !default;
+$border-selected-color: #0550C5 !default;
 $body-color: #ffffff !default;
 $cell-selected-bg: #E6EFFD !default;
 $cell-index-selected-bg: #0550C5 !default;
@@ -31,6 +32,10 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
 .#{$prefix}-table-wrapper {
 
+  p {
+    margin: 0;
+  }
+
 
   &.table-none-column-select {
     .#{$prefix}-table-cell {
@@ -44,11 +49,32 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     }
   }
 
-  .ui-rc-table {
+  .#{$prefix}-table {
     line-height: 20px;
-    //color: #283046;
-    //font-weight: 500;
-    //font-family: $fontFamily !important;
+    .#{$prefix}-table-cell {
+
+      .#{$prefix}-table-filter-column {
+        .#{$prefix}-dropdown-trigger.#{$prefix}-table-filter-trigger {
+          margin-left: 0;
+        }
+      }
+
+      &.cell-group {
+        font-weight: 600;
+        background-color: #f5f5f5;
+        border-inline-end-color: transparent !important;
+
+      }
+      &.cell-group-fixed {
+        font-weight: 600;
+        position: sticky;
+        text-align: left !important;
+        left: 0;
+        z-index: 15;
+      }
+
+    }
+
   }
 
   .#{$prefix}-table-tbody-virtual {
@@ -65,6 +91,24 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
         border-inline-end: 1px solid $tableBorderColor;
       }
     }
+    .#{$prefix}-table-container {
+      .#{$prefix}-table-thead {
+
+        > tr{
+          > th.#{$prefix}-table-cell:last-of-type {
+            //border-inline-end: 0;
+          }
+        }
+
+      }
+      .#{$prefix}-table-summary {
+        > tr{
+          > td.#{$prefix}-table-cell:last-of-type {
+            //border-inline-end: 0;
+          }
+        }
+      }
+    }
 
   }
 
@@ -79,7 +123,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
       }
 
       &.row-disabled {
-        .ui-rc-table-cell {
+        .#{$prefix}-table-cell {
           //background-color: #f5f5f5;
         }
       }
@@ -89,10 +133,10 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
           background: #FBDED6;
         }
 
-        &.ui-rc-cell-command {
-          padding: 3px 8px;
+        &.#{$prefix}-cell-command {
+          padding: 5px 8px;
 
-          .ui-rc-cell-command__content {
+          .#{$prefix}-cell-command__content {
             display: flex;
             gap: 5px;
             overflow: hidden;
@@ -102,20 +146,30 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
       }
 
-      &:has(.indent-level-1) {
-        .ui-rc-table-cell {
-          &.cell-number {
-            padding-left: 15px;
+      .#{$prefix}-table-cell:last-of-type {
+        //border-inline-end: 0;
+      }
+
+
+      @for $i from 0 through 10 {
+        &:has(.indent-level-#{$i}) {
+          .#{$prefix}-table-cell {
+            &.cell-number {
+              .ui-rc_content {
+                padding-left: $i * 10px;
+              }
+            }
           }
         }
       }
+
     }
 
-    .ui-rc-table-placeholder {
-      .ui-rc-table-cell {
+    .#{$prefix}-table-placeholder {
+      .#{$prefix}-table-cell {
         padding-top: 0 !important;
         padding-bottom: 0 !important;
-        .ui-rc-table-expanded-row-fixed {
+        .#{$prefix}-table-expanded-row-fixed {
           margin-top: 0 !important;
           margin-bottom: 0 !important;
         }
@@ -129,15 +183,20 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
       > th,
       > td {
         border-bottom: 1px solid $tableBorderColor;
+        background: #fff;
       }
     }
 
-    .ui-rc-table-cell {
-      &.ui-rc-table-cell-fix-left-last {
-        .ui-rc-table-cell-content {
+    .#{$prefix}-table-cell {
+
+      &.#{$prefix}-table-cell-fix-left-last {
+        .#{$prefix}-table-cell-content {
           //overflow: visible;
         }
       }
+      .#{$prefix}-table-column-title {
+        //display: flex;
+      }
     }
   }
 
@@ -164,6 +223,10 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
         border-inline-start: 1px solid $tableBorderColor;
         border-top: 1px solid $tableBorderColor;
 
+        &::after {
+          border-inline-end: 1px solid $tableBorderColor;
+        }
+
         > .#{$prefix}-table-content,
         > .#{$prefix}-table-header,
         > .#{$prefix}-table-body,
@@ -208,8 +271,10 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
     &.#{$prefix}-table-ping-right:not(.#{$prefix}-table-has-fix-right) .#{$prefix}-table-container::after {
       box-shadow: inset -10px 0 8px -8px $boxShadowColor;
+      //box-shadow: none;
     }
 
+
   }
 
   .#{$prefix}-table-ping-left {
@@ -251,17 +316,170 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
   &.grid-editable {
 
+    .#{$prefix}-table-row {
+      &:has(+ .#{$prefix}-table-cell) {
+
+      }
+    }
+
+    .#{$prefix}-table .#{$prefix}-table-tbody .rc-ui-cell-editable {
+      overflow: unset;
 
-    //.#{$prefix}-table.#{$prefix}-table-small .ui-rc-table-tbody .rc-ui-cell-editable{
-    .#{$prefix}-table .ui-rc-table-tbody .rc-ui-cell-editable{
       display: flex;
       padding: 0;
-      .ui-rc-table-row-expand-icon {
+
+      .#{$prefix}-table-row-expand-icon {
         top: 8px;
         left: 8px;
       }
+
+      &.cell-editable {
+        &.cell-border-top {
+          border-bottom: 1px solid $border-selected-color;
+        }
+
+        &.cell-border-bottom {
+          border-bottom: 1px solid $border-selected-color;
+        }
+
+        &.cell-border-left {
+          border-inline-end: 1px solid $border-selected-color;
+        }
+
+        &.cell-border-right {
+          border-inline-end: 1px solid $border-selected-color;
+        }
+
+        &.#{$prefix}-table-cell-fix-left {
+          &:has(.ui-rc_cell-content.selected) {
+          }
+
+        }
+
+        &.#{$prefix}-table-cell-fix-right {
+          &:has(.ui-rc_cell-content.selected) {
+          }
+
+          &.cell-border-end {
+            z-index: 3;
+          }
+
+        }
+
+
+        &.cell-border-end {
+          z-index: 1;
+        }
+
+        &.#{$prefix}-table-cell-fix-right-first {
+
+          &.cell-border-end {
+            z-index: 3;
+          }
+
+          &.next-cell-border-left {
+            &::before {
+              border-inline-start: 1px solid $border-selected-color;
+            }
+          }
+
+          &.fixed-cell-border-left {
+            &::before {
+              border-inline-start: 1px solid $border-selected-color;
+            }
+          }
+
+        }
+
+        &.#{$prefix}-table-cell-fix-left-last {
+
+          &.cell-border-end {
+            z-index: 3;
+          }
+
+        }
+
+      }
+
+
     }
 
+    .#{$prefix}-table.#{$prefix}-table-ping-left {
+      .#{$prefix}-table-tbody .rc-ui-cell-editable{
+        &.cell-editable {
+
+
+          &.#{$prefix}-table-cell-fix-left-last {
+
+            &.cell-border-left {
+              border-inline-end: 1px solid $tableBorderColor;
+            }
+
+          }
+
+
+
+        }
+      }
+
+      &:not(.#{$prefix}-table.#{$prefix}-table-ping-right) {
+
+        .#{$prefix}-table-tbody .rc-ui-cell-editable {
+          &.cell-editable {
+
+            // //&.cell-border-end {
+            //  //  z-index: 1;
+            //  //}
+
+            &.#{$prefix}-table-cell-fix-right {
+              z-index: 0;
+
+              &.cell-border-end {
+                z-index: 3;
+              }
+            }
+
+          }
+        }
+
+      }
+
+    }
+
+    .#{$prefix}-table.#{$prefix}-table-ping-right {
+      .#{$prefix}-table-tbody .rc-ui-cell-editable{
+
+        &.cell-editable {
+
+          &.#{$prefix}-table-cell-fix-right-first {
+
+            &.next-cell-border-left {
+              &::before {
+                border-inline-start: 1px solid $tableBorderColor;
+              }
+            }
+
+
+
+          }
+
+          &.#{$prefix}-table-cell-fix-left-last {
+            &.cell-border-end {
+              z-index: 3;
+            }
+          }
+
+        }
+
+        &.cell-border-end {
+          z-index: 1;
+        }
+
+      }
+
+    }
+
+
     .#{$prefix}-table.#{$prefix}-table-small {
       .#{$prefix}-table-thead > tr > th,
       tfoot > tr > th,
@@ -279,13 +497,41 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     }
 
     .ui-rc_cell-content {
+      //position: relative;
       user-select: none;
       padding: 8px 8px;
       min-height: 23px;
       overflow: hidden;
+
       .ui-rc_content {
         width: 100%;
       }
+      &:hover {
+        .dragging-point {
+          //visibility: visible;
+        }
+      }
+
+      .dragging-point {
+        //visibility: hidden;
+        width: 10px;
+        height: 10px;
+        position: absolute;
+        cursor: crosshair;
+        right: 0;
+        bottom: 0;
+
+        .dot-point {
+          position: absolute;
+          width: 8px;
+          height: 8px;
+          border-radius: 6px;
+          background-color: $border-selected-color;
+          bottom: -4px;
+          right: -4px;
+        }
+
+      }
     }
 
     .ui-rc_cell-content.selected {
@@ -296,16 +542,17 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
       &.focus {
         background-color: $cell-index-focus-bg;
         //color: #fff;
-        font-weight: 500;
+        //font-weight: 500;
       }
       &.selected {
         background-color: $cell-index-selected-bg;
         color: #fff;
-        font-weight: 500;
+        //font-weight: 500;
       }
     }
 
     .#{$prefix}-table-tbody {
+
       .#{$prefix}-table-row {
         &.#{$prefix}-table-row-selected {
           >.#{$prefix}-table-cell {
@@ -317,12 +564,56 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
             background: #FBDED6;
           }
         }
+
+        .#{$prefix}-table-cell {
+
+          .#{$prefix}-table-row-indent {
+            position: absolute;
+            @for $i from 1 through 10 {
+              &.indent-level-#{$i} {
+                padding-left: $i * 25px;;
+              }
+            }
+          }
+
+          @for $i from 0 through 10 {
+            &:has(.indent-level-#{$i}) {
+
+              .#{$prefix}-table-row-expand-icon {
+                position: absolute;
+                //.ui-rc_content {
+                padding-left: $i * 10px;
+                //}
+              }
+
+              .ui-rc_cell-content {
+                padding-left: $i * 25px + 8px;
+              }
+
+            }
+          }
+
+          @for $i from 0 through 10 {
+            &:has(.indent-level-#{$i}) {
+
+              .#{$prefix}-table-row-expand-icon {
+                position: absolute;
+                left: $i * 25px + 8px !important;
+              }
+
+              .ui-rc_cell-content {
+                padding-left: ($i + 1)* 25px + 8px;
+              }
+
+            }
+          }
+        }
       }
 
 
       .#{$prefix}-table-cell{
 
-        &.ui-rc-table-cell-ellipsis {
+        &.#{$prefix}-table-cell-ellipsis {
           .ui-rc_cell-content {
 
             .ui-rc_content {
@@ -352,11 +643,11 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
             }
           }
 
-          .ui-rc-checkbox-wrapper {
-            .ui-rc-checkbox {
+          .#{$prefix}-checkbox-wrapper {
+            .#{$prefix}-checkbox {
               background-color: red;
             }
-            .ui-rc-checkbox-input {
+            .#{$prefix}-checkbox-input {
               &:focus-visible {
                 outline: none;
               }
@@ -383,16 +674,16 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
           // ------------ select  ---------------
 
-          .ui-rc-table-select-single .ui-rc-table-select-selector,
-          .ui-rc-select-single .ui-rc-select-selector {
+          .#{$prefix}-table-select-single .#{$prefix}-table-select-selector,
+          .#{$prefix}-select-single .#{$prefix}-select-selector {
 
             border-radius: 0;
 
           }
 
-          .ui-rc-table-select-single:not(.ui-rc-table-select-customize-input) {
-            .ui-rc-table-select-selector {
-              .ui-rc-table-select-selection-search-input {
+          .#{$prefix}-table-select-single:not(.#{$prefix}-table-select-customize-input) {
+            .#{$prefix}-table-select-selector {
+              .#{$prefix}-table-select-selection-search-input {
                 height: auto;
               }
             }
@@ -407,13 +698,13 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
             outline: none;
           }
         }
-        .ui-rc-table-cell-content {
+        .#{$prefix}-table-cell-content {
           display: flex;
           height: 100%;
         }
 
         .ui-rc_cell-content,
-        .ui-rc-table-cell-content{
+        .#{$prefix}-table-cell-content{
           //width: 100%;
           flex: 1;
         }
@@ -447,13 +738,13 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     }
   }
 }
-//.ui-rc-checkbox-input {
+//.#{$prefix}-checkbox-input {
 //  &:focus-visible {
 //    outline: none;
 //  }
 //}
 
-.ui-rc-checkbox .ui-rc-checkbox-input:focus-visible+.ui-rc-checkbox-inner {
+.#{$prefix}-checkbox .#{$prefix}-checkbox-input:focus-visible+.#{$prefix}-checkbox-inner {
   outline: none;
 }
 
@@ -549,8 +840,8 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
   margin: 0;
 }
 
-.ui-rc-table-wrapper {
-  .ui-rc-table {
+.#{$prefix}-table-wrapper {
+  .#{$prefix}-table {
     .#{$prefix}-pagination {
       &::before {
         content: "";
@@ -575,7 +866,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
         border: none;
         padding-top: 0;
         padding-bottom: 0;
-        .ui-rc-pagination-total-text {
+        .#{$prefix}-pagination-total-text {
           margin-left: auto;
         }
       }
@@ -588,7 +879,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
 .#{$prefix}-pagination {
 
-  .ui-rc-pagination-total-text {
+  .#{$prefix}-pagination-total-text {
     white-space: nowrap;
   }
 
@@ -663,14 +954,14 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 }
 
 
-.ui-rc-table-wrapper {
-  .ui-rc-table.ui-rc-table-small {
-    .ui-rc-table-title,
-    .ui-rc-table-footer,
-    .ui-rc-table-cell,
-    .ui-rc-table-thead > tr > th,
-    .ui-rc-table-tbody > tr > th,
-    .ui-rc-table-tbody > tr > td,
+.#{$prefix}-table-wrapper {
+  .#{$prefix}-table.#{$prefix}-table-small {
+    .#{$prefix}-table-title,
+    .#{$prefix}-table-footer,
+    .#{$prefix}-table-cell,
+    .#{$prefix}-table-thead > tr > th,
+    .#{$prefix}-table-tbody > tr > th,
+    .#{$prefix}-table-tbody > tr > td,
     tfoot > tr > th,
     tfoot > tr > td {
       //padding: 8px 8px;
@@ -678,9 +969,9 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     }
   }
 }
-.ui-rc-table-wrapper {
-  .ui-rc-table.ui-rc-table-small {
-    .ui-rc-table-cell {
+.#{$prefix}-table-wrapper {
+  .#{$prefix}-table.#{$prefix}-table-small {
+    .#{$prefix}-table-cell {
       &:has(.ant-color-picker-trigger) {
         padding: 1px 8px;
       }
@@ -699,17 +990,17 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
 //ui-rc-table-ping-right
 
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after {
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >thead>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-header >table >thead>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-body >table >thead>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-summary >table >thead>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tbody>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-header >table >tbody>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-body >table >tbody>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-summary >table >tbody>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tfoot>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-header >table >tfoot>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-body >table >tfoot>tr >.#{$prefix}-table-cell-fix-right-first::after,
+.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-summary >table >tfoot>tr >.#{$prefix}-table-cell-fix-right-first::after {
   border-inline-end: 1px solid $tableBorderColor;
 }

package/es/grid-component/table/Grid.d.ts

@@ -1,8 +1,13 @@
 import React from 'react';
 import type { ColumnsTable, GridTableProps } from "../type";
+import type { GetRowKey } from "../type";
 type Props<T> = GridTableProps<T> & {
     tableRef: any;
     triggerChangeColumns?: (columns: ColumnsTable<T>, type: string) => void;
+    triggerChangeData?: (newData: T[], type: string) => void;
+    getRowKey: GetRowKey<T>;
+    triggerGroupColumns?: (groupedColumns: string[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
 };
 declare const Grid: <RecordType extends object>(props: Props<RecordType>) => React.JSX.Element;
 export default Grid;

package/es/grid-component/table/Grid.js

@@ -4,12 +4,9 @@ import { GridStyle } from "../GridStyle";
 import TableGrid from "../TableGrid";
 // import type {ColumnsTable} from "../type";
 
-// import {renderContent} from "../hooks/useColumns";
-
 const Grid = props => {
   const {
     height,
-    style,
     rowHoverable,
     ...rest
   } = props;
@@ -19,10 +16,7 @@ const Grid = props => {
       position: 'relative'
     }
   }, /*#__PURE__*/React.createElement(TableGrid, _extends({}, rest, {
-    style: {
-      ...style,
-      minHeight: height
-    },
+    // style={{...style, minHeight: height}}
     rowHoverable: rowHoverable ?? true
   }))));
 };