Table: added gradients

raheeliftikhar5 · raheeliftikhar5 · commit f560a9a2c5b0 · 2024-10-25T11:23:30.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableCompView.tsx
@@ -73,76 +73,54 @@ const getStyle = (
     .ant-table-tbody {
       > tr:nth-of-type(2n + 1) {
         background: ${genLinerGradient(rowStyle.background)};
-        &,
-        > td {
-          // border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
-          // border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
-        }
       }
 
       > tr:nth-of-type(2n) {
         background: ${alternateBackground};
-        &,
-        > td {
-          // border-bottom:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
-          // border-right:${rowStyle.borderWidth} ${rowStyle.borderStyle} ${rowStyle.border} !important;
-        }
       }
 
       // selected row
       > tr:nth-of-type(2n + 1).ant-table-row-selected {
         background: ${selectedRowBackground}, ${rowStyle.background} !important;
-        > td {
+        > td.ant-table-cell {
+          background: transparent !important;
         }
 
         // > td.ant-table-cell-row-hover,
         &:hover {
           background: ${hoverRowBackground}, ${selectedRowBackground}, ${rowStyle.background} !important;
         }
-        
-        > td {
-        }
       }
 
       > tr:nth-of-type(2n).ant-table-row-selected {
         background: ${selectedRowBackground}, ${alternateBackground} !important;
-        > td {
+        > td.ant-table-cell {
+          background: transparent !important;
         }
 
         // > td.ant-table-cell-row-hover,
         &:hover {
           background: ${hoverRowBackground}, ${selectedRowBackground}, ${alternateBackground} !important;
         }
-        > td {
-        }
       }
 
       // hover row
-      > tr:nth-of-type(2n + 1).row-hover {
+      > tr:nth-of-type(2n + 1):hover {
         background: ${hoverRowBackground}, ${rowStyle.background} !important;
-      }
-      > tr:nth-of-type(2n).row-hover {
-        background: ${hoverRowBackground}, ${alternateBackground} !important;
-      }
-      > tr:nth-of-type(2n + 1) > td.ant-table-cell-row-hover {
-        &,
-        > div:nth-of-type(2) {
-          // background: ${hoverRowBackground}, ${rowStyle.background} !important;
+        > td.ant-table-cell-row-hover {
+          background: transparent;
         }
       }
-
-      > tr:nth-of-type(2n) > td.ant-table-cell-row-hover {
-        // background: ${hoverRowBackground}, ${alternateBackground} !important;
-        &,
-        > div:nth-of-type(2) {
+      > tr:nth-of-type(2n):hover {
+        background: ${hoverRowBackground}, ${alternateBackground} !important;
+        > td.ant-table-cell-row-hover {
+          background: transparent;
         }
       }
 
       > tr.ant-table-expanded-row {
         background: ${background};
       }
-      > td {
-      }
     }
   `;
 };
@@ -615,11 +593,8 @@ function TableCellView(props: {
       rowHeight: rowHeight,
     }
     let { background } = style;
-    if (rowContext.selected) {
-      background = genLinerGradient(handleToSelectedRow(background)) + "," + background;
-    }
     if (rowContext.hover) {
-      background = genLinerGradient(handleToHoverRow(background)) + "," + background;
+      background = 'transparent';
     }
 
     tdView = (
@@ -655,7 +630,6 @@ function TableRowView(props: any) {
     <TableRowContext.Provider value={{ hover: hover, selected: selected }}>
       <tr
         {...props}
-        className={hover ? 'row-hover': ''}
         tabIndex={-1}
         onMouseEnter={() => setHover(true)}
         onMouseLeave={() => setHover(false)}
@@ -999,6 +973,7 @@ export function TableCompView(props: {
       <TableSummary
         tableSize={size}
         istoolbarPositionBelow={toolbar.position === "below"}
+        multiSelectEnabled={compChildren.selection.children.mode.value === 'multiple'}
         expandableRows={Boolean(expansion.expandModalView)}
         summaryRows={parseInt(summaryRows)}
         columns={columns}
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/tableSummaryComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/tableSummaryComp.tsx
@@ -9,7 +9,10 @@ import Tooltip from "antd/es/tooltip";
 
 const TableSummaryRow = styled(Table.Summary.Row)<{
   $istoolbarPositionBelow: boolean;
+  $background: string;
 }>`
+  ${props => `background: ${props.$background}`};
+
   td:last-child {
     border-right: unset !important;
   }
@@ -143,7 +146,7 @@ function TableSummaryCellView(props: {
   } = props;
 
   const style = {
-    background: cellColor || columnStyle.background || rowStyle.background,
+    background: cellColor || columnStyle.background,
     margin: columnStyle.margin || rowStyle.margin,
     text: columnStyle.text || rowStyle.text,
     border: columnStyle.border || rowStyle.border,
@@ -174,6 +177,7 @@ function TableSummaryCellView(props: {
 export function TableSummary(props: {
   tableSize: string;
   expandableRows: boolean;
+  multiSelectEnabled: boolean;
   summaryRows: number;
   columns: ColumnComp[];
   summaryRowStyle: TableSummaryRowStyleType;
@@ -185,19 +189,27 @@ export function TableSummary(props: {
     summaryRowStyle,
     tableSize,
     expandableRows,
+    multiSelectEnabled,
     istoolbarPositionBelow,
   } = props;
   let visibleColumns = columns.filter(col => !col.getView().hide);
   if (expandableRows) {
     visibleColumns.unshift(new ColumnComp({}));
   }
+  if (multiSelectEnabled) {
+    visibleColumns.unshift(new ColumnComp({}));
+  }
   
   if (!visibleColumns.length) return <></>;
 
   return (
     <Table.Summary>
       {Array.from(Array(summaryRows)).map((_, rowIndex) => (
-        <TableSummaryRow key={rowIndex} $istoolbarPositionBelow={istoolbarPositionBelow}>
+        <TableSummaryRow
+          key={rowIndex}
+          $istoolbarPositionBelow={istoolbarPositionBelow}
+          $background={summaryRowStyle.background}
+        >
           {visibleColumns.map((column, index) => {
             const summaryColumn = column.children.summaryColumns.getView()[rowIndex].getView();
             return (
