es-grid-template 1.9.71 → 1.9.73

package/lib/ali-table/utils/utility.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.addRowIdArray = void 0;
 exports.filterDataByColumns1 = filterDataByColumns1;
 exports.filterVisibleColumns = filterVisibleColumns;
-exports.getMaxDepth = exports.flattenArray = void 0;
+exports.getOnlyInA = exports.getMaxDepth = exports.flattenArray = void 0;
 exports.getVisibleColumnFields = getVisibleColumnFields;
 exports.sortByType = exports.shouldIncludeOptimized = void 0;
 exports.sortData = sortData;
@@ -111,6 +111,9 @@ const shouldIncludeOptimized = (item, queries, ignoreAccents = true) => {
         case 'contains':
           condition = ignoreAccents === false ? itemValue?.includes(value) : itemStr.includes(compareValue);
           break;
+        case 'notcontains':
+          condition = ignoreAccents === false ? !itemValue?.includes(value) : !itemStr.includes(compareValue);
+          break;
         case 'startswith':
           condition = ignoreAccents === false ? itemValue?.startsWith(value) : itemStr.startsWith(compareValue);
           break;
@@ -715,4 +718,9 @@ function getVisibleColumnFields(columns) {
   };
   traverse(columns);
   return result;
-}
+}
+const getOnlyInA = (a, b) => {
+  const setB = new Set(b);
+  return a.filter(item => !setB.has(item));
+};
+exports.getOnlyInA = getOnlyInA;

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

@@ -43,6 +43,10 @@ const stringOperator = exports.stringOperator = [{
   value: 'contains',
   key: '~=',
   label: 'Contains'
+}, {
+  value: 'notcontains',
+  key: '!~=',
+  label: 'Does not contain'
 }, {
   value: 'equal',
   key: '==',

package/lib/group-component/hook/useColumns.js

@@ -215,12 +215,12 @@ const toggleRowSelection = props => {
     } else {
       // chưa selected
 
-      const checkedRows = [...prevSelected, row];
+      const checkedRows = [...prevSelected, row.original];
       setIsSelectionChange({
         isChange: true,
         type: 'rowSelected',
         rowData: row.original,
-        rowsData: selectionSettings?.type === 'single' ? [row] : checkedRows
+        rowsData: selectionSettings?.type === 'single' ? [row.original] : checkedRows
       });
     }
     return;

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

@@ -893,6 +893,9 @@ const shouldInclude = (item, queries) => {
       case "contains":
         condition = itemStr?.includes(queryStr);
         break;
+      case "notcontains":
+        condition = !itemStr?.includes(queryStr);
+        break;
       case "startswith":
         condition = itemStr?.startsWith(queryStr);
         break;

package/lib/table-component/ColumnsConfig.js

@@ -69,6 +69,7 @@ const ColumnsConfig = props => {
   };
   const handleAccept = () => {
     triggerChangeColumns?.(tmpColumn, [], 'columnChoose');
+    setCurrentRow('');
     onClose();
   };
   const handleChange = newElemt => {
@@ -118,10 +119,11 @@ const ColumnsConfig = props => {
         return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Input, {
           defaultValue: value,
           allowClear: true,
+          autoFocus: true,
           onBlur: e => {
             const newData = {
               ...rowData,
-              visible: e.target.value
+              headerText: e.target.value
             };
             handleChange(newData);
           }
@@ -218,7 +220,7 @@ const ColumnsConfig = props => {
       } = args;
       if (currentRow === rowData.field) {
         return /*#__PURE__*/_react.default.createElement(_rcMasterUi.InputNumber, {
-          defaultValue: value,
+          defaultValue: value ?? 150,
           style: {
             width: '100%'
           },
@@ -226,13 +228,13 @@ const ColumnsConfig = props => {
           onBlur: e => {
             const newData = {
               ...rowData,
-              visible: e.target.value
+              width: e.target.value ? Number(e.target.value) : 150
             };
             handleChange(newData);
           }
         });
       }
-      return /*#__PURE__*/_react.default.createElement("span", null, value);
+      return /*#__PURE__*/_react.default.createElement("span", null, value ?? 150, "px");
     }
   }];
   const handleReset = () => {

package/lib/table-component/TableContainer.js

@@ -366,6 +366,7 @@ const TableContainer = props => {
     summary: summary,
     dataSource: dataSource,
     infiniteScroll: infiniteScroll,
+    pagination: pagination,
     next: next,
     loading: loading,
     columnVirtualizer: columnVirtualizer,

package/lib/table-component/TableContainerEdit.js

@@ -2273,6 +2273,7 @@ const TableContainerEdit = props => {
     summary: summary,
     dataSource: dataSource,
     infiniteScroll: infiniteScroll,
+    pagination: pagination,
     next: next,
     loading: loading,
     columnVirtualizer: columnVirtualizer,

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

@@ -1183,6 +1183,9 @@ const shouldInclude = (item, queries, ignoreAccents) => {
       case "contains":
         condition = ignoreAccents === false ? itemValue?.includes(value) : itemStr?.includes(queryStr);
         break;
+      case "notcontains":
+        condition = ignoreAccents === false ? !itemValue?.includes(value) : !itemStr?.includes(queryStr);
+        break;
       case "startswith":
         condition = ignoreAccents === false ? itemValue?.startsWith(value) : itemStr?.startsWith(queryStr);
         break;

package/lib/table-component/table/Grid.js

@@ -69,8 +69,8 @@ const Grid = props => {
   const [columnResizeMode] = _react.default.useState('onChange');
   const [columnResizeDirection] = _react.default.useState('ltr');
   const [paginationState, setPagination] = _react.default.useState({
-    pageIndex: pagination && pagination.currentPage ? pagination.currentPage - 1 : 0,
-    pageSize: pagination && pagination.pageSize ? pagination.pageSize : 20
+    pageIndex: pagination && pagination?.currentPage ? pagination.currentPage - 1 : 0,
+    pageSize: pagination && pagination?.pageSize ? pagination.pageSize : 20
   });
 
   // const [rowSelection, setRowSelection] = React.useState<RowSelectionState>({})

package/lib/table-component/table/TableWrapper.js

@@ -14,7 +14,6 @@ var _reactTooltip = require("react-tooltip");
 var _ContextMenu = _interopRequireDefault(require("../ContextMenu"));
 var _react = _interopRequireWildcard(require("react"));
 var _useContext = require("../useContext");
-var _utils = require("../hook/utils");
 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; }
 const TableWrapper = props => {
@@ -49,6 +48,12 @@ const TableWrapper = props => {
   const menuRef = _react.default.useRef(null);
   const loadingRef = _react.default.useRef(false);
   const hasMoreRef = _react.default.useRef(true);
+  const pendingPageRef = _react.default.useRef(null);
+  const pendingDataLengthRef = _react.default.useRef(0);
+  const sawLoadingRef = _react.default.useRef(false);
+  const lastScrollTopRef = _react.default.useRef(0);
+  // const directionRef = React.useRef<'up' | 'down' | null>(null);
+
   const {
     windowSize
   } = (0, _react.useContext)(_useContext.TableContext);
@@ -57,6 +62,23 @@ const TableWrapper = props => {
     pageSize,
     total
   } = pagination ?? {};
+  _react.default.useEffect(() => {
+    if (pendingPageRef.current === null) {
+      return;
+    }
+    if (loading) {
+      sawLoadingRef.current = true;
+      return;
+    }
+    const pageLoaded = currentPage >= pendingPageRef.current;
+    const dataLoaded = dataSource.length !== pendingDataLengthRef.current;
+    const requestFinished = sawLoadingRef.current;
+    if (pageLoaded || dataLoaded || requestFinished) {
+      loadingRef.current = false;
+      pendingPageRef.current = null;
+      sawLoadingRef.current = false;
+    }
+  }, [currentPage, dataSource.length, loading]);
   const [menuVisible, setMenuVisible] = _react.default.useState(false);
   const [selectedRowData, setSelectedRowData] = _react.default.useState(undefined);
   const [position, setPosition] = _react.default.useState({
@@ -83,46 +105,88 @@ const TableWrapper = props => {
   const loadData = page => {
     if (!hasMoreRef.current || loadingRef.current || loading) return;
     loadingRef.current = true;
-    setTimeout(() => {
-      next?.();
-      if (page * pageSize >= total) {
-        hasMoreRef.current = false;
-      }
-      loadingRef.current = false;
-    }, 10);
+    pendingPageRef.current = page;
+    pendingDataLengthRef.current = dataSource.length;
+    next?.();
+    if (pageSize && total && page * pageSize >= total) {
+      hasMoreRef.current = false;
+    }
   };
   const handleNext = () => {
     loadData(currentPage + 1);
   };
   const handleScroll = e => {
-    if (infiniteScroll) {
-      if (loadingRef.current || loading || dataSource?.length === 0) {
-        e.stopPropagation();
-        e.preventDefault();
-        return;
-      }
-      const {
-        scrollHeight: tbScrollHeight,
-        scrollTop,
-        clientHeight
-      } = e.currentTarget;
-      const abc = clientHeight * ((0, _utils.isNullOrUndefined)(onEndReachedThreshold) ? 0.1 : onEndReachedThreshold ?? 0);
+    // if (infiniteScroll) {
+    //   const current = e.currentTarget.scrollTop;
+    //   const last = lastScrollTopRef.current;
 
-      // const isEnd = scrollTop + clientHeight >= tbScrollHeight - 50;
-      const isEnd = scrollTop + clientHeight >= tbScrollHeight - abc;
-      if (isEnd && !loadingRef.current && hasMoreRef.current && dataSource?.length > 0) {
-        handleNext();
-      }
+    //   if (loadingRef.current || loading || dataSource?.length === 0 || current === last) {
+
+    //     e.stopPropagation()
+    //     e.preventDefault()
+    //     return
+    //   }
+
+    //   const { scrollHeight: tbScrollHeight, scrollTop, clientHeight } = e.currentTarget;
+
+    //   const abc = clientHeight * (isNullOrUndefined(onEndReachedThreshold) ? 0.1 : onEndReachedThreshold ?? 0)
+
+    //   // const isEnd = scrollTop + clientHeight >= tbScrollHeight - 50;
+    //   const isEnd = scrollTop + clientHeight >= tbScrollHeight - abc;
+
+    //   if (isEnd && !loadingRef.current && hasMoreRef.current && dataSource?.length > 0) {
+
+    //     handleNext()
+
+    //   }
+    // }
+
+    // if (e.target.scrollLeft >= 0 && e.target.scrollLeft + e.target.clientWidth < e.target.scrollWidth) {
+    //   e.target.classList.add('ui-rc-table-ping-right')
+    // } else {
+    //   e.target.classList.remove('ui-rc-table-ping-right')
+    // }
+
+    // if ((e.target.scrollLeft ?? 0) > 0) {
+    //   e.target.classList.add('ui-rc-table-ping-left')
+    // } else {
+    //   e.target.classList.remove('ui-rc-table-ping-left')
+    // }
+
+    const target = e.currentTarget;
+
+    // Horizontal scroll
+    const {
+      scrollLeft,
+      clientWidth,
+      scrollWidth,
+      clientHeight
+    } = target;
+    target.classList.toggle('ui-rc-table-ping-left', scrollLeft > 0);
+    target.classList.toggle('ui-rc-table-ping-right', scrollLeft + clientWidth < scrollWidth);
+    if (!infiniteScroll) {
+      return;
+    }
+    const {
+      scrollTop,
+      scrollHeight
+    } = target;
+    const last = lastScrollTopRef.current;
+
+    // Update ngay
+    lastScrollTopRef.current = scrollTop;
+
+    // Chỉ xử lý khi scroll DOWN
+    if (scrollTop <= last) {
+      return;
     }
-    if (e.target.scrollLeft >= 0 && e.target.scrollLeft + e.target.clientWidth < e.target.scrollWidth) {
-      e.target.classList.add('ui-rc-table-ping-right');
-    } else {
-      e.target.classList.remove('ui-rc-table-ping-right');
+    if (loadingRef.current || loading || !dataSource?.length || !hasMoreRef.current) {
+      return;
     }
-    if ((e.target.scrollLeft ?? 0) > 0) {
-      e.target.classList.add('ui-rc-table-ping-left');
-    } else {
-      e.target.classList.remove('ui-rc-table-ping-left');
+    const thresholdRatio = onEndReachedThreshold ?? 0.1;
+    const threshold = clientHeight * thresholdRatio;
+    if (scrollTop + clientHeight >= scrollHeight - threshold) {
+      handleNext();
     }
   };
   const onContextMenu = args => event => {

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

@@ -948,6 +948,9 @@ const shouldInclude = (item, queries) => {
       case "contains":
         condition = itemStr?.includes(queryStr);
         break;
+      case "notcontains":
+        condition = !itemStr?.includes(queryStr);
+        break;
       case "startswith":
         condition = itemStr?.startsWith(queryStr);
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.9.71",
+  "version": "1.9.73",
   "description": "es-grid-template",
   "keywords": [
     "react",