es-grid-template 1.3.5 → 1.3.7

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

@@ -96,7 +96,7 @@ const Group = props => {
     })));
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(GridStyle, {
-    heightTable: height,
+    $heightTable: height,
     style: {
       position: 'relative'
     }

package/lib/grid-component/EditableCell.js

@@ -574,6 +574,7 @@ const EditableCell = props => {
           },
           treeCheckable: column?.editSelectSettings?.selectMode === 'checkbox',
           filterTreeNode: filterTreeNode,
+          popupMatchSelectWidth: menuWidth ? menuWidth + 10 : undefined,
           onSelect: (val, option) => {
             onChange(val ?? '');
             const formState = getValues();

package/lib/grid-component/GridStyle.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="react" />
-export declare const GridStyle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, {
-    heightTable?: number | string;
-}>> & string;
+interface GridProps {
+    $heightTable?: number | string;
+}
+export declare const GridStyle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, GridProps>> & string;
+export {};

package/lib/grid-component/GridStyle.js

@@ -9,4 +9,4 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 const GridStyle = exports.GridStyle = _styledComponents.default.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-sueu2e-0"
-})([".ui-rc-table-container{min-height:", ";}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;background-color:#ffffff;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;background-color:#ffffff;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}}}.react-resizable{position:relative;background-clip:padding-box;}.rc-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.heightTable ? typeof props.heightTable === 'string' ? props.heightTable : `${props.heightTable}px` : undefined);
+})([".ui-rc-table-container{min-height:", ";}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;background-color:#ffffff;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;background-color:#ffffff;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}}}.react-resizable{position:relative;background-clip:padding-box;}.rc-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.$heightTable ? typeof props.$heightTable === 'string' ? props.$heightTable : `${props.$heightTable}px` : undefined);

package/lib/grid-component/TableGrid.js

@@ -24,6 +24,8 @@ var _AdvanceFilter = _interopRequireDefault(require("./AdvanceFilter"));
 var _reactTooltip = require("react-tooltip");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// import  Table from "../../core/table"
+
 // import {ConfigProvider} from "antd";
 
 const convertFilters = filters => {
@@ -366,8 +368,10 @@ const TableGrid = props => {
     loading: {
       spinning: columns && columns.length === 0 || loading === true,
       indicator: /*#__PURE__*/_react.default.createElement(_LoadingSpinner.default, null)
-    },
-    dataSource: columns && columns.length > 0 ? (0, _hooks.filterDataByColumns3)(dataSource, filterStates) : []
+    }
+    // dataSource={columns && columns.length > 0 ? filterDataByColumns3(dataSource, filterStates) : []}
+    ,
+    dataSource: columns && columns.length > 0 ? (0, _hooks.filterDataByColumns4)(dataSource, filterStates) : []
     // dataSource={columns && columns.length > 0 && loading !== true ? dataSource : []}
     // className={styles.customTable}
     ,
@@ -392,17 +396,16 @@ const TableGrid = props => {
     },
     rowSelection: columns && columns.length === 0 ? undefined : {
       ...selectionSettings,
-      type: selectionSettings?.mode === 'checkbox' || type === 'multiple' ? 'checkbox' : "radio",
-      columnWidth: !mode ? 0.0000001 : columnWidth ?? 50,
+      // type: selectionSettings?.mode,
+      type: mode,
+      columnWidth: columnWidth ?? 50,
       onChange: onSelectChange,
       // selectedRowKeys: mode === 'checkbox' && type === 'single' ? selectedRowKeys : undefined,
       selectedRowKeys: mergedSelectedKeys,
-      defaultSelectedRowKeys: selectionSettings?.defaultSelectedRowKeys,
+      // defaultSelectedRowKeys: selectionSettings?.defaultSelectedRowKeys,
+      defaultSelectedRowKeys: defaultSelectedRowKeys,
       preserveSelectedRowKeys: true,
-      // ...rowSelection,
-      // checkStrictly: false,
-
-      hideSelectAll: !type || type === 'single' || selectionSettings?.mode === 'radio' ? true : hideSelectAll ?? type !== 'multiple'
+      hideSelectAll: !type || type === 'single' || mode === 'radio' ? true : hideSelectAll ?? type !== 'multiple'
     }
 
     // onScroll={() => {
@@ -419,7 +422,7 @@ const TableGrid = props => {
       }
       return /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary, {
         fixed: true
-      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary.Row, null, (0, _columns.flatColumns)([_rcMasterUi.Table.SELECTION_COLUMN, ...columns]).filter(col => col.hidden !== true).map((col, index) => {
+      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary.Row, null, (0, _columns.flatColumns)(!!mode ? [_rcMasterUi.Table.SELECTION_COLUMN, ...columns] : [...columns]).filter(col => col.hidden !== true).map((col, index) => {
         const thousandSeparator = col.format?.thousandSeparator ? col.format?.thousandSeparator : format?.thousandSeparator;
         const decimalSeparator = col.format?.decimalSeparator ? col.format?.decimalSeparator : format?.decimalSeparator;
         const dec = col.format?.decimalScale || col.format?.decimalScale === 0 ? col.format?.decimalScale : format?.decimalScale;
@@ -443,7 +446,7 @@ const TableGrid = props => {
         }, col.summaryTemplate ? col.summaryTemplate(cellValue, col.key) : (0, _reactNumericComponent.numericFormatter)(cellValue, numericFormatProps));
       })));
     },
-    pagination: !pagination || pagination && pagination.onChange ? false : {
+    pagination: !pagination || pagination && pagination?.onChange ? false : {
       showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} items`,
       ...pagination
     },

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

@@ -87,7 +87,8 @@ const getValueCell = (column, value, format) => {
 
       // const contentNumber = !isEmpty(value) ? ((dec || dec === 0) ? parseFloat(Number(value).toFixed(dec)).toString() : value.toString()) : '0'
 
-      const contentNumber = !(0, _utils.isEmpty)(value) ? dec || dec === 0 ? parseFloat(value.toFixed(dec)).toString() : value.toString() : '0';
+      const tmpval = typeof value === 'string' ? Number(value) : value;
+      const contentNumber = !(0, _utils.isEmpty)(value) ? dec || dec === 0 ? parseFloat(tmpval.toFixed(dec)).toString() : tmpval.toString() : '0';
       const numericFormatProps = {
         thousandSeparator: (0, _utils.checkThousandSeparator)(thousandSeparator, decimalSeparator),
         decimalSeparator: (0, _utils.checkDecimalSeparator)(thousandSeparator, decimalSeparator),

package/lib/grid-component/hooks/useColumns.js

@@ -165,8 +165,8 @@ const useColumns = config => {
   const transformColumns = (0, _react.useCallback)(columns => {
     // >>>>>>>>>>> Support selection
     const cloneColumns = [...columns];
-    const firstNonGroupColumn = (0, _columns.flatColumns2)(cloneColumns).find(col => col.field && col.field !== '#' && col.field !== 'index' && !groupColumns?.includes(col.field) && col.hidden !== true);
-    const nonGroupColumns = (0, _columns.flatColumns2)(cloneColumns).filter(col => col.field && col.field !== '#' && col.field !== 'index' && !groupColumns?.includes(col.field) && col.hidden !== true);
+    const firstNonGroupColumn = (0, _columns.flatColumns2)(cloneColumns).find(col => col.field && col.field !== '#' && !groupColumns?.includes(col.field) && col.hidden !== true);
+    const nonGroupColumns = (0, _columns.flatColumns2)(cloneColumns).filter(col => col.field && col.field !== '#' && !groupColumns?.includes(col.field) && col.hidden !== true);
 
     // ===================== Render =====================
 
@@ -202,19 +202,18 @@ const useColumns = config => {
             children: convertColumns(transformedColumn.children)
           };
         }
-        if (["index", "#"].includes(col.field)) {
+        if (transformedColumn.field === '#') {
           return {
             ...transformedColumn,
             onCell: () => ({
               className: 'cell-number'
             }),
             render: (val, record) => {
-              // return rowIndex + 1
               return (0, _utils.findItemPath)(dataSource, record, rowKey);
             }
           };
         }
-        if (col.field === 'command') {
+        if (transformedColumn.field === 'command') {
           return {
             ...transformedColumn,
             onCell: () => ({
@@ -300,6 +299,9 @@ const useColumns = config => {
             }
             if (col.field === firstNonGroupColumn?.field && record.children) {
               const currentGroupColumn = (0, _columns.flatColumns2)(cols).find(it => it.field === record.field);
+              if (currentGroupColumn?.template) {
+                return (0, _columns.renderContent)(currentGroupColumn, record[record.field], record, rowIndex, format);
+              }
               return /*#__PURE__*/React.createElement("span", null, currentGroupColumn?.headerText, ": ", (0, _columns.renderContent)(currentGroupColumn, record[record.field], record, rowIndex, format));
             }
             return (0, _columns.renderContent)(col, value, record, rowIndex, format);

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

@@ -62,6 +62,13 @@ export declare function addRows8(arr: any, n: number): {
     combined: any[];
     addedRows: any[];
 };
+export declare function addRowsUp(array: any, n: number): {
+    combined: any;
+    addedRows: any[];
+} | {
+    combined: any[];
+    addedRows: any[];
+};
 export declare const transformColumns: <RecordType>(cols: ColumnsTable<RecordType>, convertColumns: any[], t?: any) => ColumnsTable<RecordType>;
 export declare const transformColumns1: <RecordType>(cols: ColumnsTable<RecordType>, sortMultiple?: boolean) => ColumnsTable<RecordType>;
 export declare const removeColumns: <RecordType>(columns: ColumnTable<RecordType>[], groupColumns: string[]) => ColumnsTable<RecordType>;
@@ -76,6 +83,8 @@ export declare const filterDataByColumns: (data: any[], queries: any) => any[];
 export declare const filterDataByColumns2: (data: any[], queries: any) => any[];
 export declare const removeFieldRecursive: (data: any[], field: string) => any[];
 export declare const filterDataByColumns3: (data: any[], queries: any[]) => any[];
+export declare const shouldInclude: (item: any, queries: any[]) => any;
+export declare function filterDataByColumns4(data: any[], queries: any[]): any[];
 export declare function isDateString(str: any): boolean;
 export declare function compareDates(date1: any, date2: any): boolean;
 export declare function compareDate(itemValue: any, value: any): boolean;
@@ -93,3 +102,17 @@ export declare function isRightMostInRegion(rowIndex: number, colIndex: number,
 export declare function isEqualSet(setA: any, setB: any): boolean;
 export declare function isBottomMostInRanges(rowIndex: number, colIndex: number, regions: any[]): boolean;
 export declare const mergedSets: (arr: any[]) => Set<unknown>;
+export declare const sortedSetASC: (setValue: any) => Set<unknown>;
+export declare const sortedSetDSC: (setValue: any) => Set<unknown>;
+export declare function getBottomRowCells(cellSet: any): any[];
+export declare function getCellsByPosition(cellSet: any, position?: string): any[];
+export declare const addBorderClass: (selectedCells: any, type: string, className: string, id?: string) => void;
+export declare const removeBorderClass: (selectedCells: any, type: string, className: string, id?: string) => void;
+export declare const onAddClassBgSelectedCell: (selectedCells: any, id?: string) => void;
+export declare const onRemoveClassSelectedCell: (selectedCells: any, id?: string, rowsSelected?: any) => void;
+export declare const addClassBorderPasteCell: (pasteCells: any, type: 'up' | 'down', id?: string) => void;
+export declare const removeClassBorderPasteCell: (pasteCells: any, type: 'up' | 'down', id?: string) => void;
+export declare const addClassCellIndexSelected: (rowsSelected: any, id?: string) => void;
+export declare const removeClassCellIndexSelected: (rowsSelected: any, id?: string) => void;
+export declare const showDraggingPoint: (selectedCells: any, id?: any) => void;
+export declare const hideDraggingPoint: (selectedCells: any, id?: any) => void;