es-grid-template 1.6.3 → 1.6.5

package/es/grid-component/InternalTable.js

@@ -184,6 +184,7 @@ const InternalTable = props => {
     infiniteScroll,
     wrapSettings,
     onFilter,
+    onSorter,
     ...rest
   } = props;
   const id = React.useMemo(() => {
@@ -480,7 +481,8 @@ const InternalTable = props => {
           ...getColumnSearchProps(column)
         }),
         sorter: column.sorter === false ? undefined : {
-          compare: a => a,
+          // @ts-ignore
+          compare: (a, b) => onSorter ? a : a[column.field] - b[column.field],
           multiple: sortMultiple ? colIndex : undefined
         },
         sortIcon: args => {
@@ -864,6 +866,9 @@ const InternalTable = props => {
       triggerChangeData(newData);
     }
   };
+  const handleChange = (paging, filters, sorter) => {
+    onSorter?.(sorter);
+  };
   const TableComponent = infiniteScroll ? InfiniteTable : groupAble ? Group : editAble ? GridEdit : Grid;
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(DndContext, {
     sensors: sensors,
@@ -934,7 +939,12 @@ const InternalTable = props => {
     },
     setMergedFilterKeys: setMergedFilterKeys,
     mergedFilterKeys: mergedFilterKeys,
-    wrapSettings: wrapSettings
+    wrapSettings: wrapSettings,
+    onChange: handleChange
+
+    // onChange={(paging, filters, sorter) => {
+    //   handleChange(sorter)
+    // }}
   })))), /*#__PURE__*/React.createElement(DragOverlay, {
     style: {
       minWidth: 100,

package/es/grid-component/TableGrid.js

@@ -88,7 +88,7 @@ const TableGrid = props => {
     triggerGroupColumns,
     summary,
     showToolbar,
-    onSorter,
+    // onSorter,
     bottomToolbar,
     groupSetting,
     groupAble,
@@ -266,9 +266,10 @@ const TableGrid = props => {
       }
     }
   };
-  const handleChange = sorter => {
-    onSorter?.(sorter);
-  };
+
+  // const handleChange = (sorter: any) => {
+  //   onSorter?.(sorter)
+  // }
 
   // const handleOnFilter = (queries: any) => {
   //
@@ -356,9 +357,10 @@ const TableGrid = props => {
     //   // onFilter?.(convertFilters(val))
     //
     // }}
+
+    // onChange={(paging, filters, sorter) => handleChange(sorter)}
     ,
 
-    onChange: (paging, filters, sorter) => handleChange(sorter),
     title: showToolbar === false ? undefined : () => {
       return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement("div", null, title?.(dataSource)), /*#__PURE__*/React.createElement("div", {
         style: {

package/es/grid-component/control/InputControl/InputControl.js

@@ -4,7 +4,6 @@ import { Input } from "rc-master-ui";
 import { Typography } from "antd";
 import classnames from "classnames";
 import React, { Fragment } from "react";
-// import type { InputType } from "reactstrap/types/lib/Input"
 import { isNullOrUndefined } from "../../hooks";
 import { Col, Row } from "rc-master-ui/es/grid";
 // import {isNullOrUndefined} from "../../../hooks"
@@ -39,7 +38,7 @@ const InputControl = props => {
   } = props;
   const renderLabel = () => {
     return /*#__PURE__*/React.createElement(Col, {
-      span: 8
+      span: 6
     }, isLabel === false ? '' : /*#__PURE__*/React.createElement("label", {
       className: "form-label"
     }, t ? t(label ? label : '') : label ? label : '', " ", required ? /*#__PURE__*/React.createElement("span", {
@@ -112,7 +111,7 @@ const InputControl = props => {
     // }, inLine === false ? 'form-group ' : 'form-row-inline d-flex'
     // )}
   }, renderLabel(), /*#__PURE__*/React.createElement(Col, {
-    span: 16,
+    span: 18,
     className: classnames('', {
       'hidden-label': isLabel === false
     })

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

@@ -478,9 +478,9 @@ export const unFlattenData = data => {
 
   // Bước 1: Tạo map id -> node
   data.forEach(item => {
+    // idToNodeMap[item.rowId] = { ...item, children: [] }
     idToNodeMap[item.rowId] = {
-      ...item,
-      children: []
+      ...item
     };
   });
 

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

@@ -1373,7 +1373,13 @@ const GridEdit = props => {
     // Chuyển đổi dữ liệu từ clipboard thành mảng
     const rowsPasted = pasteData.split("\n").filter(row => row !== '').map(row =>
     // const rows = pasteData.split("\n").map((row: any) =>
-    row.replace(/\r/g, "").split("\t"));
+    row.replace(/\r/g, "").split("\t")
+
+    // {
+    //   console.log('row', row)
+    //   return row.replace(/\r/g, "").split("\t")
+    // }
+    );
     if (rowsPasted.length > (onCellPaste?.maxRowsPaste ?? 200)) {
       // bật popup thông báo
 

package/lib/grid-component/InternalTable.js

@@ -193,6 +193,7 @@ const InternalTable = props => {
     infiniteScroll,
     wrapSettings,
     onFilter,
+    onSorter,
     ...rest
   } = props;
   const id = _react.default.useMemo(() => {
@@ -489,7 +490,8 @@ const InternalTable = props => {
           ...getColumnSearchProps(column)
         }),
         sorter: column.sorter === false ? undefined : {
-          compare: a => a,
+          // @ts-ignore
+          compare: (a, b) => onSorter ? a : a[column.field] - b[column.field],
           multiple: sortMultiple ? colIndex : undefined
         },
         sortIcon: args => {
@@ -873,6 +875,9 @@ const InternalTable = props => {
       triggerChangeData(newData);
     }
   };
+  const handleChange = (paging, filters, sorter) => {
+    onSorter?.(sorter);
+  };
   const TableComponent = infiniteScroll ? _InfiniteTable.default : groupAble ? _Group.default : editAble ? _GridEdit.default : _Grid.default;
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.DndContext, {
     sensors: sensors,
@@ -943,7 +948,12 @@ const InternalTable = props => {
     },
     setMergedFilterKeys: setMergedFilterKeys,
     mergedFilterKeys: mergedFilterKeys,
-    wrapSettings: wrapSettings
+    wrapSettings: wrapSettings,
+    onChange: handleChange
+
+    // onChange={(paging, filters, sorter) => {
+    //   handleChange(sorter)
+    // }}
   })))), /*#__PURE__*/_react.default.createElement(_core.DragOverlay, {
     style: {
       minWidth: 100,

package/lib/grid-component/TableGrid.js

@@ -88,7 +88,7 @@ const TableGrid = props => {
     triggerGroupColumns,
     summary,
     showToolbar,
-    onSorter,
+    // onSorter,
     bottomToolbar,
     groupSetting,
     groupAble,
@@ -266,9 +266,10 @@ const TableGrid = props => {
       }
     }
   };
-  const handleChange = sorter => {
-    onSorter?.(sorter);
-  };
+
+  // const handleChange = (sorter: any) => {
+  //   onSorter?.(sorter)
+  // }
 
   // const handleOnFilter = (queries: any) => {
   //
@@ -356,9 +357,10 @@ const TableGrid = props => {
     //   // onFilter?.(convertFilters(val))
     //
     // }}
+
+    // onChange={(paging, filters, sorter) => handleChange(sorter)}
     ,
 
-    onChange: (paging, filters, sorter) => handleChange(sorter),
     title: showToolbar === false ? undefined : () => {
       return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement("div", null, title?.(dataSource)), /*#__PURE__*/_react.default.createElement("div", {
         style: {

package/lib/grid-component/control/InputControl/InputControl.js

@@ -15,8 +15,6 @@ var _hooks = require("../../hooks");
 var _grid = require("rc-master-ui/es/grid");
 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 type { InputType } from "reactstrap/types/lib/Input"
-
 // import {isNullOrUndefined} from "../../../hooks"
 
 const {
@@ -49,7 +47,7 @@ const InputControl = props => {
   } = props;
   const renderLabel = () => {
     return /*#__PURE__*/_react.default.createElement(_grid.Col, {
-      span: 8
+      span: 6
     }, isLabel === false ? '' : /*#__PURE__*/_react.default.createElement("label", {
       className: "form-label"
     }, t ? t(label ? label : '') : label ? label : '', " ", required ? /*#__PURE__*/_react.default.createElement("span", {
@@ -122,7 +120,7 @@ const InputControl = props => {
     // }, inLine === false ? 'form-group ' : 'form-row-inline d-flex'
     // )}
   }, renderLabel(), /*#__PURE__*/_react.default.createElement(_grid.Col, {
-    span: 16,
+    span: 18,
     className: (0, _classnames.default)('', {
       'hidden-label': isLabel === false
     })

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

@@ -558,9 +558,9 @@ const unFlattenData = data => {
 
   // Bước 1: Tạo map id -> node
   data.forEach(item => {
+    // idToNodeMap[item.rowId] = { ...item, children: [] }
     idToNodeMap[item.rowId] = {
-      ...item,
-      children: []
+      ...item
     };
   });
 

package/lib/grid-component/table/GridEdit.js

@@ -1370,7 +1370,13 @@ const GridEdit = props => {
     // Chuyển đổi dữ liệu từ clipboard thành mảng
     const rowsPasted = pasteData.split("\n").filter(row => row !== '').map(row =>
     // const rows = pasteData.split("\n").map((row: any) =>
-    row.replace(/\r/g, "").split("\t"));
+    row.replace(/\r/g, "").split("\t")
+
+    // {
+    //   console.log('row', row)
+    //   return row.replace(/\r/g, "").split("\t")
+    // }
+    );
     if (rowsPasted.length > (onCellPaste?.maxRowsPaste ?? 200)) {
       // bật popup thông báo
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -62,7 +62,7 @@
     "rc-checkbox": "^3.5.0",
     "rc-dropdown": "^4.2.1",
     "rc-field-form": "^2.6.0",
-    "rc-master-ui": "^1.1.38",
+    "rc-master-ui": "^1.1.39",
     "rc-select": "^14.16.3",
     "rc-tooltip": "^6.3.0",
     "rc-tree": "^5.10.1",