es-grid-template 1.8.47 → 1.8.50

package/es/table-component/TableContainer.js

@@ -27,7 +27,7 @@ const TableContainer = props => {
     table,
     id,
     prefix,
-    // commandClick,
+    commandClick,
     editAble,
     rowKey,
     format,
@@ -160,7 +160,18 @@ const TableContainer = props => {
       // })
     }
   }, [columnSizingInfo]);
-  const triggerCommandClick = () => {};
+  const triggerCommandClick = args => {
+    // const { id: idCommand, rowId, rowData, index } = args
+
+    // const tmpData = [...dataSource]
+
+    if (commandClick) {
+      commandClick({
+        ...args,
+        rows: originData
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
     id: id

package/es/table-component/TableContainerEdit.js

@@ -483,7 +483,7 @@ const TableContainerEdit = props => {
                   [columnKey]: null
                 };
               }
-              if (isFormattedNumber(cellValue.trim())) {
+              if (isFormattedNumber(cellValue.trim()) || !isNaN(Number(cellValue.trim()))) {
                 const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
                 const valuePasteFormat = detectSeparators(cellValue.trim());
                 const cellFormat = getFormat(colFormat, format);

package/es/table-component/body/TableBodyCell.js

@@ -477,6 +477,10 @@ const TableBodyCell = props => {
           isSelectionChange,
           selectionSettings
         });
+        setFocusedCell?.({
+          colId: cell.column.id,
+          rowId: cell.row.id
+        });
       }
     }
   }, /*#__PURE__*/React.createElement("div", {

package/es/table-component/body/TableBodyCellEdit.js

@@ -697,6 +697,78 @@ const TableBodyCellEdit = props => {
       }
       return;
     }
+    if (e.key === 'ArrowDown') {
+      // e.preventDefault()
+      // e.stopPropagation()
+
+      const nextRow = table.getRowModel().rows[rowNumber + 1];
+      if (nextRow) {
+        const nextRowId = nextRow.id;
+        setFocusedCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setStartCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setEndCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setRangeState?.(getSelectedCellMatrix(table, {
+          rowId: nextRowId,
+          colId
+        }, {
+          rowId: nextRowId,
+          colId
+        }));
+
+        // columnVirtualizer.scrollToIndex(nextCol.getIndex(), { align: 'center' })
+        // rowVirtualizer.scrollToIndex(nextRow.index, { align: 'center' })
+
+        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
+        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
+        if (cellFocus) {
+          cellFocus.focus();
+        }
+      }
+      return;
+    }
+    if (e.key === 'ArrowUp') {
+      // e.preventDefault()
+      // e.stopPropagation()
+
+      const nextRow = table.getRowModel().rows[rowNumber - 1];
+      if (nextRow) {
+        const nextRowId = nextRow.id;
+        setFocusedCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setStartCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setEndCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setRangeState?.(getSelectedCellMatrix(table, {
+          rowId: nextRowId,
+          colId
+        }, {
+          rowId: nextRowId,
+          colId
+        }));
+        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
+        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
+        if (cellFocus) {
+          cellFocus.focus();
+        }
+      }
+      return;
+    }
     if (e.key === 'Delete') {
       handleDeleteContent?.();
       return;

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

@@ -1916,92 +1916,11 @@ export const convertToObjTrue = arr => {
 export const getDiffent2Array = (a, b) => {
   return [...a.filter(x => !b.includes(x)), ...b.filter(x => !a.includes(x))];
 };
-
-// export function isTree(arr: any[]): boolean {
-//   if (!Array.isArray(arr)){
-//     return false
-//   }
-
-//   function checkNode(node: any): boolean {
-//     if (typeof node !== "object" || node === null) {
-//       return false
-//     }
-
-//     if ("children" in node) {
-
-//       if (!Array.isArray(node.children)) {
-//         return false
-//       }
-//       if (node.children.length === 0) {
-//         return false
-//       }
-
-//       for (const child of node.children) {
-//         if (!checkNode(child)) {
-//           return false
-//         }
-//       }
-
-//     }
-
-//     return true;
-//   }
-
-//   for (const item of arr) {
-//     if (!checkNode(item)) return false;
-//   }
-
-//   return true;
-// }
-
 export function findFirst(items) {
   const leftItem = items.find(item => item.getIsPinned() === 'left');
   if (leftItem) return leftItem;
   return null;
 }
-
-// export function isTreeArray(arr: any[]): boolean {
-//   if (!Array.isArray(arr) || arr.length === 0) {
-
-//     return false
-//   }
-
-//   // const requireNonEmpty = options?.requireNonEmptyChildren ?? false
-//   let hasParent = false
-
-//   for (const item of arr) {
-//     if (typeof item !== 'object' || item === null) {
-
-//       return false
-//     }
-
-//     if ('children' in item) {
-//       const children = (item as any).children
-//       if (!Array.isArray(children)) {
-//         // return false;
-//         hasParent =  false
-//       }
-
-//       if (children && children.length > 0) {
-//           hasParent = true
-//         }
-
-//       // if (requireNonEmpty) {
-
-//       //   if (children.length > 0) {
-//       //     hasParent = true
-//       //   }
-//       // } else {
-
-//       //   hasParent = true
-
-//       // }
-//     }
-//   }
-
-//   return hasParent
-// }
-
 export function isTreeArray(arr) {
   if (!Array.isArray(arr) || arr.length === 0) {
     return false;

package/lib/table-component/TableContainer.js

@@ -37,7 +37,7 @@ const TableContainer = props => {
     table,
     id,
     prefix,
-    // commandClick,
+    commandClick,
     editAble,
     rowKey,
     format,
@@ -170,7 +170,18 @@ const TableContainer = props => {
       // })
     }
   }, [columnSizingInfo]);
-  const triggerCommandClick = () => {};
+  const triggerCommandClick = args => {
+    // const { id: idCommand, rowId, rowData, index } = args
+
+    // const tmpData = [...dataSource]
+
+    if (commandClick) {
+      commandClick({
+        ...args,
+        rows: originData
+      });
+    }
+  };
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: containerRef,
     id: id

package/lib/table-component/TableContainerEdit.js

@@ -490,7 +490,7 @@ const TableContainerEdit = props => {
                   [columnKey]: null
                 };
               }
-              if ((0, _utils.isFormattedNumber)(cellValue.trim())) {
+              if ((0, _utils.isFormattedNumber)(cellValue.trim()) || !isNaN(Number(cellValue.trim()))) {
                 const colFormat = typeof columnOri.format === 'function' ? columnOri.format(record) : columnOri.format;
                 const valuePasteFormat = (0, _utils.detectSeparators)(cellValue.trim());
                 const cellFormat = (0, _utils.getFormat)(colFormat, format);

package/lib/table-component/body/TableBodyCell.js

@@ -484,6 +484,10 @@ const TableBodyCell = props => {
           isSelectionChange,
           selectionSettings
         });
+        setFocusedCell?.({
+          colId: cell.column.id,
+          rowId: cell.row.id
+        });
       }
     }
   }, /*#__PURE__*/_react.default.createElement("div", {

package/lib/table-component/body/TableBodyCellEdit.js

@@ -703,6 +703,78 @@ const TableBodyCellEdit = props => {
       }
       return;
     }
+    if (e.key === 'ArrowDown') {
+      // e.preventDefault()
+      // e.stopPropagation()
+
+      const nextRow = table.getRowModel().rows[rowNumber + 1];
+      if (nextRow) {
+        const nextRowId = nextRow.id;
+        setFocusedCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setStartCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setEndCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setRangeState?.((0, _utils.getSelectedCellMatrix)(table, {
+          rowId: nextRowId,
+          colId
+        }, {
+          rowId: nextRowId,
+          colId
+        }));
+
+        // columnVirtualizer.scrollToIndex(nextCol.getIndex(), { align: 'center' })
+        // rowVirtualizer.scrollToIndex(nextRow.index, { align: 'center' })
+
+        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
+        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
+        if (cellFocus) {
+          cellFocus.focus();
+        }
+      }
+      return;
+    }
+    if (e.key === 'ArrowUp') {
+      // e.preventDefault()
+      // e.stopPropagation()
+
+      const nextRow = table.getRowModel().rows[rowNumber - 1];
+      if (nextRow) {
+        const nextRowId = nextRow.id;
+        setFocusedCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setStartCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setEndCell?.({
+          rowId: nextRowId,
+          colId
+        });
+        setRangeState?.((0, _utils.getSelectedCellMatrix)(table, {
+          rowId: nextRowId,
+          colId
+        }, {
+          rowId: nextRowId,
+          colId
+        }));
+        const row = document.querySelector(`.ui-rc-grid-row[data-row-key="${nextRowId}"]`);
+        const cellFocus = row?.querySelector('.ui-rc-grid-cell:not(.ui-rc-grid-cell-selection)');
+        if (cellFocus) {
+          cellFocus.focus();
+        }
+      }
+      return;
+    }
     if (e.key === 'Delete') {
       handleDeleteContent?.();
       return;

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

@@ -2037,92 +2037,12 @@ exports.convertToObjTrue = convertToObjTrue;
 const getDiffent2Array = (a, b) => {
   return [...a.filter(x => !b.includes(x)), ...b.filter(x => !a.includes(x))];
 };
-
-// export function isTree(arr: any[]): boolean {
-//   if (!Array.isArray(arr)){
-//     return false
-//   }
-
-//   function checkNode(node: any): boolean {
-//     if (typeof node !== "object" || node === null) {
-//       return false
-//     }
-
-//     if ("children" in node) {
-
-//       if (!Array.isArray(node.children)) {
-//         return false
-//       }
-//       if (node.children.length === 0) {
-//         return false
-//       }
-
-//       for (const child of node.children) {
-//         if (!checkNode(child)) {
-//           return false
-//         }
-//       }
-
-//     }
-
-//     return true;
-//   }
-
-//   for (const item of arr) {
-//     if (!checkNode(item)) return false;
-//   }
-
-//   return true;
-// }
 exports.getDiffent2Array = getDiffent2Array;
 function findFirst(items) {
   const leftItem = items.find(item => item.getIsPinned() === 'left');
   if (leftItem) return leftItem;
   return null;
 }
-
-// export function isTreeArray(arr: any[]): boolean {
-//   if (!Array.isArray(arr) || arr.length === 0) {
-
-//     return false
-//   }
-
-//   // const requireNonEmpty = options?.requireNonEmptyChildren ?? false
-//   let hasParent = false
-
-//   for (const item of arr) {
-//     if (typeof item !== 'object' || item === null) {
-
-//       return false
-//     }
-
-//     if ('children' in item) {
-//       const children = (item as any).children
-//       if (!Array.isArray(children)) {
-//         // return false;
-//         hasParent =  false
-//       }
-
-//       if (children && children.length > 0) {
-//           hasParent = true
-//         }
-
-//       // if (requireNonEmpty) {
-
-//       //   if (children.length > 0) {
-//       //     hasParent = true
-//       //   }
-//       // } else {
-
-//       //   hasParent = true
-
-//       // }
-//     }
-//   }
-
-//   return hasParent
-// }
-
 function isTreeArray(arr) {
   if (!Array.isArray(arr) || arr.length === 0) {
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.8.47",
+  "version": "1.8.50",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -64,7 +64,7 @@
     "rc-checkbox": "^3.5.0",
     "rc-dropdown": "^4.2.1",
     "rc-field-form": "^2.6.0",
-    "rc-master-ui": "1.1.44",
+    "rc-master-ui": "1.1.47",
     "rc-select": "^14.16.3",
     "rc-tooltip": "^6.3.0",
     "rc-tree": "^5.10.1",