npm - react-table-edit - Versions diffs - 0.7.2 → 0.7.4 - Mend

react-table-edit 0.7.2 → 0.7.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.d.mts CHANGED Viewed

@@ -110,6 +110,7 @@ type IColumnTable = {
     commandItems?: ICommandItem[];
     editTypeCondition?: any;
     onPaste?: any;
+    onPasteValidate?: any;
     placeholder?: string;
     numericSettings?: ISettingNumericElement;
     selectSettings?: ISettingSelectElement;

package/dist/index.d.ts CHANGED Viewed

@@ -110,6 +110,7 @@ type IColumnTable = {
     commandItems?: ICommandItem[];
     editTypeCondition?: any;
     onPaste?: any;
+    onPasteValidate?: any;
     placeholder?: string;
     numericSettings?: ISettingNumericElement;
     selectSettings?: ISettingSelectElement;

package/dist/index.js CHANGED Viewed

@@ -3076,73 +3076,112 @@ var TableEdit = (0, import_react16.forwardRef)((props, ref) => {
     const column = contentColumns[col + index];
     if (column) {
       if (column.visible !== false) {
-        return column;
+        return { ...column };
       } else {
         return getColumn(col, index + 1);
       }
     }
     return void 0;
   };
-  const pasteDataFromExcel = async (row, col, e) => {
+  const pasteDataFromExcel = async (currenRowIndex, col, e) => {
     const clipboard = (e.clipboardData || window.Clipboard).getData("text");
-    const arrayRow = clipboard.trimEnd().split("\n");
+    const rowsClipboard = clipboard.trimEnd().split("\n");
     setIndexFocus(void 0);
-    for (let indexRow = 0; indexRow < arrayRow.length; indexRow++) {
-      const item = arrayRow[indexRow];
-      const arrayCol = item.trimEnd().split("	");
-      let dataRow = dataSource[row + indexRow];
-      if (!dataRow) {
-        dataRow = { ...defaultValue };
-        dataSource.push(dataRow);
-      }
-      for (let index = 0; index < arrayCol.length; index++) {
-        const stringData = arrayCol[index].toString().trim();
+    if (rowsClipboard.length > 0) {
+      const columnsDataChange = [];
+      for (let index = 0; index < rowsClipboard[0].trimEnd().split("	").length; index++) {
+        const stringData = [];
+        rowsClipboard.forEach((element) => {
+          if (element.trimEnd().split("	")[index]) {
+            stringData.push(element.trimEnd().split("	")[index].toString().trim());
+          }
+        });
         const column = getColumn(col, index);
         if (column) {
-          if ((!column.disabledCondition || !column.disabledCondition(row)) && column.editEnable) {
-            if (column.onPaste) {
-              const rs = await column.onPaste(stringData, indexRow, row);
+          if ((!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + 0])) && column.editEnable) {
+            if (column.onPasteValidate) {
+              const rs = await column.onPasteValidate(stringData.join(","), 0, dataSource[currenRowIndex + 0]);
               if (rs) {
-                dataRow = rs.dataRow;
-                dataRow[column.field] = stringData;
-                if (column.callback) {
-                  column.callback(rs.value, indexRow);
-                }
-              } else {
-                notificationError(t("PasteExcelNotExist", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                column.resultValidate = rs;
               }
-            } else {
-              if (column.editType === "date") {
-                const date = new Date(stringData);
-                if (!isNaN(date.getTime())) {
-                  dataRow[column.field] = date;
-                  if (column.callback) {
-                    column.callback(date, indexRow);
+            }
+          }
+        }
+        columnsDataChange.push(column);
+      }
+      for (let indexRow = 0; indexRow < rowsClipboard.length; indexRow++) {
+        const item = rowsClipboard[indexRow];
+        const colsClipboard = item.trimEnd().split("	");
+        let dataRow = dataSource[currenRowIndex + indexRow];
+        if (!dataRow) {
+          dataRow = { ...defaultValue };
+          dataSource.push(dataRow);
+        }
+        for (let index = 0; index < colsClipboard.length; index++) {
+          const stringData = colsClipboard[index].toString().trim();
+          const column = columnsDataChange[index];
+          if (column) {
+            console.log(!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + indexRow]));
+            if ((!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + indexRow])) && column.editEnable) {
+              if (column.onPasteValidate && column.resultValidate) {
+                const rs = column.resultValidate.find((item2) => item2[column.selectSettings?.fieldValue] === stringData);
+                if (rs) {
+                  if (column.onPaste) {
+                    dataRow[column.field] = column.onPaste(dataRow, stringData);
+                  } else {
+                    dataRow[column.field] = stringData;
                   }
-                } else {
-                  notificationError(t("PasteExcelIncorrectFormat", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
-                }
-              } else if (column.editType === "numeric") {
-                const number = Number(stringData);
-                if (!isNaN(number)) {
-                  dataRow[column.field] = number;
                   if (column.callback) {
-                    column.callback(number, indexRow);
+                    column.callback(rs, currenRowIndex + indexRow);
                   }
                 } else {
-                  notificationError(t("PasteExcelIncorrectFormat", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  notificationError(t("PasteExcelNotExist", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
                 }
               } else {
-                dataRow[column.field] = stringData;
-                if (column.callback) {
-                  column.callback(stringData, indexRow);
+                if (column.editType === "date") {
+                  const date = new Date(stringData);
+                  if (!isNaN(date.getTime())) {
+                    if (column.onPaste) {
+                      dataRow[column.field] = column.onPaste(dataRow, date);
+                    } else {
+                      dataRow[column.field] = date;
+                    }
+                    if (column.callback) {
+                      column.callback(date, currenRowIndex + indexRow);
+                    }
+                  } else {
+                    notificationError(t("PasteExcelIncorrectFormat", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  }
+                } else if (column.editType === "numeric") {
+                  const number = Number(stringData);
+                  if (!isNaN(number)) {
+                    if (column.onPaste) {
+                      dataRow[column.field] = column.onPaste(dataRow, number);
+                    } else {
+                      dataRow[column.field] = number;
+                    }
+                    if (column.callback) {
+                      column.callback(number, currenRowIndex + indexRow);
+                    }
+                  } else {
+                    notificationError(t("PasteExcelIncorrectFormat", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  }
+                } else {
+                  if (column.onPaste) {
+                    column.onPaste(dataRow, stringData);
+                  } else {
+                    dataRow[column.field] = stringData;
+                  }
+                  if (column.callback) {
+                    column.callback(stringData, currenRowIndex + indexRow);
+                  }
                 }
               }
             }
           }
         }
+        rowChange(dataRow, currenRowIndex + indexRow, "");
       }
-      rowChange(dataRow, row + indexRow, "");
     }
     changeDataSource(dataSource);
   };

package/dist/index.mjs CHANGED Viewed

@@ -3042,73 +3042,112 @@ var TableEdit = forwardRef3((props, ref) => {
     const column = contentColumns[col + index];
     if (column) {
       if (column.visible !== false) {
-        return column;
+        return { ...column };
       } else {
         return getColumn(col, index + 1);
       }
     }
     return void 0;
   };
-  const pasteDataFromExcel = async (row, col, e) => {
+  const pasteDataFromExcel = async (currenRowIndex, col, e) => {
     const clipboard = (e.clipboardData || window.Clipboard).getData("text");
-    const arrayRow = clipboard.trimEnd().split("\n");
+    const rowsClipboard = clipboard.trimEnd().split("\n");
     setIndexFocus(void 0);
-    for (let indexRow = 0; indexRow < arrayRow.length; indexRow++) {
-      const item = arrayRow[indexRow];
-      const arrayCol = item.trimEnd().split("	");
-      let dataRow = dataSource[row + indexRow];
-      if (!dataRow) {
-        dataRow = { ...defaultValue };
-        dataSource.push(dataRow);
-      }
-      for (let index = 0; index < arrayCol.length; index++) {
-        const stringData = arrayCol[index].toString().trim();
+    if (rowsClipboard.length > 0) {
+      const columnsDataChange = [];
+      for (let index = 0; index < rowsClipboard[0].trimEnd().split("	").length; index++) {
+        const stringData = [];
+        rowsClipboard.forEach((element) => {
+          if (element.trimEnd().split("	")[index]) {
+            stringData.push(element.trimEnd().split("	")[index].toString().trim());
+          }
+        });
         const column = getColumn(col, index);
         if (column) {
-          if ((!column.disabledCondition || !column.disabledCondition(row)) && column.editEnable) {
-            if (column.onPaste) {
-              const rs = await column.onPaste(stringData, indexRow, row);
+          if ((!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + 0])) && column.editEnable) {
+            if (column.onPasteValidate) {
+              const rs = await column.onPasteValidate(stringData.join(","), 0, dataSource[currenRowIndex + 0]);
               if (rs) {
-                dataRow = rs.dataRow;
-                dataRow[column.field] = stringData;
-                if (column.callback) {
-                  column.callback(rs.value, indexRow);
-                }
-              } else {
-                notificationError(t("PasteExcelNotExist", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                column.resultValidate = rs;
               }
-            } else {
-              if (column.editType === "date") {
-                const date = new Date(stringData);
-                if (!isNaN(date.getTime())) {
-                  dataRow[column.field] = date;
-                  if (column.callback) {
-                    column.callback(date, indexRow);
+            }
+          }
+        }
+        columnsDataChange.push(column);
+      }
+      for (let indexRow = 0; indexRow < rowsClipboard.length; indexRow++) {
+        const item = rowsClipboard[indexRow];
+        const colsClipboard = item.trimEnd().split("	");
+        let dataRow = dataSource[currenRowIndex + indexRow];
+        if (!dataRow) {
+          dataRow = { ...defaultValue };
+          dataSource.push(dataRow);
+        }
+        for (let index = 0; index < colsClipboard.length; index++) {
+          const stringData = colsClipboard[index].toString().trim();
+          const column = columnsDataChange[index];
+          if (column) {
+            console.log(!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + indexRow]));
+            if ((!column.disabledCondition || !column.disabledCondition(dataSource[currenRowIndex + indexRow])) && column.editEnable) {
+              if (column.onPasteValidate && column.resultValidate) {
+                const rs = column.resultValidate.find((item2) => item2[column.selectSettings?.fieldValue] === stringData);
+                if (rs) {
+                  if (column.onPaste) {
+                    dataRow[column.field] = column.onPaste(dataRow, stringData);
+                  } else {
+                    dataRow[column.field] = stringData;
                   }
-                } else {
-                  notificationError(t("PasteExcelIncorrectFormat", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
-                }
-              } else if (column.editType === "numeric") {
-                const number = Number(stringData);
-                if (!isNaN(number)) {
-                  dataRow[column.field] = number;
                   if (column.callback) {
-                    column.callback(number, indexRow);
+                    column.callback(rs, currenRowIndex + indexRow);
                   }
                 } else {
-                  notificationError(t("PasteExcelIncorrectFormat", { index: row + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  notificationError(t("PasteExcelNotExist", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
                 }
               } else {
-                dataRow[column.field] = stringData;
-                if (column.callback) {
-                  column.callback(stringData, indexRow);
+                if (column.editType === "date") {
+                  const date = new Date(stringData);
+                  if (!isNaN(date.getTime())) {
+                    if (column.onPaste) {
+                      dataRow[column.field] = column.onPaste(dataRow, date);
+                    } else {
+                      dataRow[column.field] = date;
+                    }
+                    if (column.callback) {
+                      column.callback(date, currenRowIndex + indexRow);
+                    }
+                  } else {
+                    notificationError(t("PasteExcelIncorrectFormat", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  }
+                } else if (column.editType === "numeric") {
+                  const number = Number(stringData);
+                  if (!isNaN(number)) {
+                    if (column.onPaste) {
+                      dataRow[column.field] = column.onPaste(dataRow, number);
+                    } else {
+                      dataRow[column.field] = number;
+                    }
+                    if (column.callback) {
+                      column.callback(number, currenRowIndex + indexRow);
+                    }
+                  } else {
+                    notificationError(t("PasteExcelIncorrectFormat", { index: currenRowIndex + indexRow + 1, field: t(column.headerText ?? ""), value: stringData }));
+                  }
+                } else {
+                  if (column.onPaste) {
+                    column.onPaste(dataRow, stringData);
+                  } else {
+                    dataRow[column.field] = stringData;
+                  }
+                  if (column.callback) {
+                    column.callback(stringData, currenRowIndex + indexRow);
+                  }
                 }
               }
             }
           }
         }
+        rowChange(dataRow, currenRowIndex + indexRow, "");
       }
-      rowChange(dataRow, row + indexRow, "");
     }
     changeDataSource(dataSource);
   };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "react-table-edit",
   "license": "MIT",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",