es-grid-template 1.5.2 → 1.5.4

package/es/grid-component/CheckboxFilter.js

@@ -79,7 +79,6 @@ const CheckboxFilter = props => {
 
   // const [searchValue, setSearchValue] = React.useState('');
 
-  console.log('options', options);
   const [openKeys, setOpenKeys] = React.useState([]);
 
   // clear search value after close filter dropdown
@@ -172,9 +171,6 @@ const CheckboxFilter = props => {
       onSelect?.(keys);
     }
   };
-  console.log('getTreeData({ filters: options })', getTreeData({
-    filters: options
-  }));
   if (filterMode === 'tree') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, showFilter && /*#__PURE__*/React.createElement(FilterSearch, {
       filterSearch: filterSearch,

package/es/grid-component/ColumnsGroup/ColumnsGroup.js

@@ -83,7 +83,6 @@ export const ColumnsGroup = props => {
     onSubmit(defaultGroupColumns ? defaultGroupColumns : []);
   };
   const handleClickChange = open => {
-    console.log('open', open);
     setClicked(open);
     if (open) {
       if (columnsGrouped) {

package/es/grid-component/InternalTable.js

@@ -16,6 +16,7 @@ import viDr from "rc-master-ui/es/locales/vi_VN";
 // import useColumns from "./hooks/useColumns";
 
 import "./styles.scss";
+// import 'rc-master-ui/es/date-range-picker/styles/index.less'
 // import 'rc-master-ui/assets/index.css'
 
 import { flatColumns2, renderContent, renderFilter } from "./hooks/columns";

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

@@ -2,8 +2,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { Fragment } from 'react';
 import { GridStyle } from "../GridStyle";
 import TableGrid from "../TableGrid";
-// import type {ColumnsTable} from "../type";
-
 import { findAllChildrenKeys } from "../hooks";
 import { ColumnsGroup } from "../ColumnsGroup/ColumnsGroup";
 import { flatColumns2 } from "../hooks/columns";
@@ -137,9 +135,12 @@ const Group = props => {
           expanded,
           onExpand
         } = args;
+        if (!groupColumns || groupColumns?.length === 0) {
+          return '';
+        }
 
         // @ts-ignore
-        if (record?.children?.length > 0 || record?.isChildren) {
+        if ((record?.children || record?.isChildren) && groupColumns?.length > 0) {
           return expanded ? /*#__PURE__*/React.createElement("button", {
             onClick: e => {
               e.preventDefault();

package/lib/grid-component/CheckboxFilter.js

@@ -88,7 +88,6 @@ const CheckboxFilter = props => {
 
   // const [searchValue, setSearchValue] = React.useState('');
 
-  console.log('options', options);
   const [openKeys, setOpenKeys] = React.useState([]);
 
   // clear search value after close filter dropdown
@@ -181,9 +180,6 @@ const CheckboxFilter = props => {
       onSelect?.(keys);
     }
   };
-  console.log('getTreeData({ filters: options })', getTreeData({
-    filters: options
-  }));
   if (filterMode === 'tree') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, showFilter && /*#__PURE__*/React.createElement(_FilterSearch.default, {
       filterSearch: filterSearch,

package/lib/grid-component/ColumnsGroup/ColumnsGroup.js

@@ -93,7 +93,6 @@ const ColumnsGroup = props => {
     onSubmit(defaultGroupColumns ? defaultGroupColumns : []);
   };
   const handleClickChange = open => {
-    console.log('open', open);
     setClicked(open);
     if (open) {
       if (columnsGrouped) {

package/lib/grid-component/InternalTable.js

@@ -42,6 +42,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 
 // import useColumns from "./hooks/useColumns";
 
+// import 'rc-master-ui/es/date-range-picker/styles/index.less'
 // import 'rc-master-ui/assets/index.css'
 
 // import {CSS} from "@dnd-kit/utilities";

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

@@ -15,8 +15,6 @@ var _columns = require("../hooks/columns");
 var _becoxyIcons = require("becoxy-icons");
 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 {ColumnsTable} from "../type";
-
 const Group = props => {
   const {
     t,
@@ -146,9 +144,12 @@ const Group = props => {
           expanded,
           onExpand
         } = args;
+        if (!groupColumns || groupColumns?.length === 0) {
+          return '';
+        }
 
         // @ts-ignore
-        if (record?.children?.length > 0 || record?.isChildren) {
+        if ((record?.children || record?.isChildren) && groupColumns?.length > 0) {
           return expanded ? /*#__PURE__*/_react.default.createElement("button", {
             onClick: e => {
               e.preventDefault();

package/package.json

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