es-grid-template 1.5.14 → 1.5.15

package/es/collapse/index.d.ts

@@ -0,0 +1,4 @@
+import { Collapse } from 'rc-master-ui';
+import type { CollapseProps, CollapsePanelProps } from 'rc-master-ui';
+export type { CollapseProps, CollapsePanelProps };
+export default Collapse;

package/es/collapse/index.js

@@ -0,0 +1,2 @@
+import { Collapse } from 'rc-master-ui';
+export default Collapse;

package/es/date-range-picker/index.d.ts

@@ -0,0 +1,4 @@
+import DateRangePicker from 'rc-master-ui/es/date-range-picker';
+import type { DateRangePickerProps } from 'rc-master-ui/es/date-range-picker';
+export type { DateRangePickerProps };
+export default DateRangePicker;

package/es/date-range-picker/index.js

@@ -0,0 +1,2 @@
+import DateRangePicker from 'rc-master-ui/es/date-range-picker';
+export default DateRangePicker;

package/es/datepicker/index.d.ts

@@ -0,0 +1,4 @@
+import DatePicker from 'rc-master-ui/es/DatePicker';
+import type { DatePickerProps, DatePickerType } from 'rc-master-ui/es/date-picker';
+export type { DatePickerProps, DatePickerType };
+export default DatePicker;

package/es/datepicker/index.js

@@ -0,0 +1,2 @@
+import DatePicker from 'rc-master-ui/es/DatePicker';
+export default DatePicker;

package/es/grid-component/InternalTable.js

@@ -179,6 +179,7 @@ const InternalTable = props => {
     height: propsHeight,
     summary,
     infiniteScroll,
+    wrapSettings,
     ...rest
   } = props;
   const id = React.useMemo(() => {
@@ -377,7 +378,8 @@ const InternalTable = props => {
             ...column
           },
           t: t,
-          id: id
+          id: id,
+          wrapSettings: wrapSettings
         })),
         ellipsis: column.ellipsis !== false,
         align: column.textAlign ?? column.align,
@@ -392,7 +394,9 @@ const InternalTable = props => {
             column: {
               ...column
             },
-            t: t
+            t: t,
+            id: id,
+            wrapSettings: wrapSettings
           }),
           onCell: data => ({
             // className: 'cell-number',
@@ -415,7 +419,9 @@ const InternalTable = props => {
             column: {
               ...column
             },
-            t: t
+            t: t,
+            id: id,
+            wrapSettings: wrapSettings
           }),
           onCell: data => ({
             // className: 'cell-number',
@@ -536,7 +542,9 @@ const InternalTable = props => {
           column: {
             ...column
           },
-          t: t
+          t: t,
+          id: id,
+          wrapSettings: wrapSettings
         })),
         ellipsis: column.ellipsis !== false,
         align: column.textAlign ?? column.align,

package/es/grid-component/TableGrid.js

@@ -322,13 +322,26 @@ const TableGrid = props => {
           rowData: selectedRow
         });
       } else {
+        const keySet = new Set(keys);
+
         // @ts-ignore
-        setMergedSelectedKeys(keys);
-        rowSelected?.({
-          selected: selectedRows,
-          type: 'rowSelected',
-          rowData: selectedRow
-        });
+        if (!keySet.has(selectedRow[rowKey])) {
+          setMergedSelectedKeys([]);
+          rowSelected?.({
+            selected: [],
+            type: 'rowSelected',
+            rowData: selectedRow
+          });
+        } else {
+          // @ts-ignore
+          setMergedSelectedKeys([selectedRow[rowKey]]);
+          rowSelected?.({
+            // @ts-ignore
+            selected: [selectedRow[rowKey]],
+            type: 'rowSelected',
+            rowData: selectedRow
+          });
+        }
       }
     }
   };

package/es/grid-component/hooks/columns/index.js

@@ -67,8 +67,8 @@ export const getValueCell = (column, value, record, format) => {
       // const contentNumber = !isEmpty(value) ? ((dec || dec === 0) ? parseFloat(Number(value).toFixed(dec)).toString() : value.toString()) : '0'
 
       const tmpval = typeof value === 'string' ? Number(value) : value;
-      const contentNumber = !isEmpty(value) ? dec || dec === 0 ? parseFloat(tmpval.toFixed(dec)).toString() : tmpval.toString() : '0';
-      // const contentNumber = !isEmpty(value) ? ((dec || dec === 0) ? tmpval.toString() : tmpval.toString()) : '0'
+
+      // console.log('aaaaa', Number(value))
 
       const numericFormatProps = {
         thousandSeparator: checkThousandSeparator(thousandSeparator, decimalSeparator),
@@ -79,6 +79,16 @@ export const getValueCell = (column, value, record, format) => {
         decimalScale: dec,
         fixedDecimalScale: cellFormat?.fixedDecimalScale ?? false
       };
+
+      // if ( typeof value === "string") {
+      //   const ttt =  removeNumericFormat(value, undefined, numericFormatProps )
+      //
+      //   console.log('ttt', ttt)
+      // }
+
+      const contentNumber = !isEmpty(value) ? dec || dec === 0 ? parseFloat(tmpval.toFixed(dec)).toString() : tmpval.toString() : '0';
+      // const contentNumber = !isEmpty(value) ? ((dec || dec === 0) ? tmpval.toString() : tmpval.toString()) : '0'
+
       return !isEmpty(contentNumber) ? numericFormatter(contentNumber, numericFormatProps) : '';
     case 'date':
       return value ? dayjs(value).format(format?.dateFormat ?? 'DD/MM/YYYY') : '';

package/es/grid-component/hooks/content/HeaderContent.d.ts

@@ -1,9 +1,11 @@
 import React from "react";
 import type { ColumnTable } from "../../type";
+import type { IWrapSettings } from "../../type";
 type Props = {
     t?: any;
     id?: string;
     content?: string;
+    wrapSettings?: IWrapSettings;
     column?: ColumnTable;
     template?: React.ReactElement | React.ReactNode | (() => React.ReactElement | React.ReactNode);
     tooltip?: string | number | React.ReactElement | React.ReactNode | (() => React.ReactElement | React.ReactNode);

package/es/grid-component/hooks/content/HeaderContent.js

@@ -1,25 +1,36 @@
 import React, { Fragment } from "react";
 import classnames from "classnames";
 import { getTemplate } from "../utils";
+import styled from "styled-components";
+const HeaderStyle = styled.div.withConfig({
+  displayName: "HeaderStyle",
+  componentId: "es-grid-template__sc-ibhq66-0"
+})([""]);
 const HeaderContent = props => {
   const {
     t,
-    id
+    id,
+    wrapSettings
   } = props;
   const {
     headerTooltip,
     headerText,
     columnGroupText,
-    headerTemplate
+    headerTemplate,
+    headerTextWrap,
+    ellipsis
   } = props.column ?? {};
   const text = React.useMemo(() => {
     return columnGroupText ?? headerText;
   }, [columnGroupText, headerText]);
   const tooltip = React.useMemo(() => {
-    return headerTooltip ?? t ? t?.(columnGroupText ?? headerText) : columnGroupText ?? headerText;
+    return t ? t?.(headerTooltip ?? columnGroupText ?? headerText) : headerTooltip ?? columnGroupText ?? headerText;
   }, [columnGroupText, headerText, headerTooltip, t]);
-  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classnames('', {}),
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(HeaderStyle, {
+    className: classnames('', {
+      'ui-rc-table-cell-ellipsis': ellipsis !== false && headerTextWrap !== true,
+      'header-text-wrap': headerTextWrap ?? (wrapSettings?.wrapMode === 'Header' || wrapSettings?.wrapMode === 'Both')
+    }),
     "data-tooltip-id": `${id}-tooltip-header`,
     "data-tooltip-content": tooltip,
     "data-tooltip-offset": 16

package/es/grid-component/hooks/utils.d.ts

@@ -144,3 +144,8 @@ export declare const hideDraggingPoint: (selectedCells: any, id?: any) => void;
 export declare const isRangeCell: (selectedCells: any, type: string, rowIndex: number, colIndex: number) => boolean;
 export declare const isSelectedCell: (selectedCells: any, rowIndex: number, colIndex: number) => any;
 export declare function groupArrayByColumns(arr: any[], columns: string[] | undefined): any;
+export declare const isFormattedNumber: (str: string) => boolean;
+export declare const detectSeparators: (str: string) => {
+    thousandSeparator: string;
+    decimalSeparator: string;
+};

package/es/grid-component/hooks/utils.js

@@ -2062,4 +2062,63 @@ export function groupArrayByColumns(arr, columns) {
   } else {
     return arr;
   }
-}
+}
+export const isFormattedNumber = str => {
+  if (!str) return false;
+  if (typeof str !== 'string') return false;
+  const regexUS = /^\d{1,3}(,\d{3})*(\.\d+)?$/; // 100,000.111
+  const regexEU = /^\d{1,3}(\.\d{3})*(,\d+)?$/; // 100.000,111
+
+  // Không có dấu hàng nghìn, chỉ dấu thập phân: 100000.1 hoặc 100000,01
+  const regexDecimalOnly = /^\d+([.,]\d{1,})$/;
+  return regexUS.test(str) || regexEU.test(str) || regexDecimalOnly.test(str);
+};
+export const detectSeparators = str => {
+  if (typeof str !== 'string') return null;
+  const hasComma = str.includes(',');
+  const hasDot = str.includes('.');
+
+  // Trường hợp có cả dấu , và .
+  if (hasComma && hasDot) {
+    const lastComma = str.lastIndexOf(',');
+    const lastDot = str.lastIndexOf('.');
+    return lastComma > lastDot ? {
+      thousandSeparator: '.',
+      decimalSeparator: ','
+    } : {
+      thousandSeparator: ',',
+      decimalSeparator: '.'
+    };
+  }
+
+  // Trường hợp chỉ có dấu phẩy
+  if (hasComma && !hasDot) {
+    const parts = str.split(',');
+    if (parts.length === 2) {
+      return parts[1].length === 3 ? {
+        thousandSeparator: ',',
+        decimalSeparator: null
+      } : {
+        thousandSeparator: null,
+        decimalSeparator: ','
+      };
+    }
+  }
+
+  // Trường hợp chỉ có dấu chấm
+  if (hasDot && !hasComma) {
+    const parts = str.split('.');
+    if (parts.length === 2) {
+      return parts[1].length === 3 ? {
+        thousandSeparator: '.',
+        decimalSeparator: null
+      } : {
+        thousandSeparator: null,
+        decimalSeparator: '.'
+      };
+    }
+  }
+
+  // Không có dấu hoặc không hợp lệ
+  return null;
+};

package/es/grid-component/styles.scss

@@ -317,6 +317,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
           //overflow: visible;
         }
       }
+
       .#{$prefix}-table-column-title {
         //display: flex;
       }
@@ -324,9 +325,18 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
       &.head-align-center {
         text-align: center;
       }
+
       &.head-align-right {
         text-align: right;
       }
+
+      .ui-rc-table-column-title {
+        .header-text-wrap {
+          white-space: normal !important;
+        }
+      }
+
+
     }
   }
 
@@ -1085,6 +1095,23 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
   }
 }
 
+
+// -------------- radio ----------
+
+.ui-rc-radio-wrapper {
+  .ui-rc-radio-checked {
+    .ui-rc-radio-inner {
+      background-color: $primary;
+      border-color: $primary;
+    }
+  }
+  &:hover {
+    .ui-rc-radio-inner {
+      border-color: $primary;
+    }
+  }
+}
+
 // ------------ Tree ---------------
 
 .#{$prefix}-tree {