es-grid-template 0.0.7 → 0.0.8

package/es/CheckboxFilter.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import type { TableLocale } from "ui-rc/dist/table/interface";
+import type { TableLocale } from "rc-master-ui/es/table/interface";
 type Props = {
     options: any[];
     filterSearch?: boolean;

package/es/CheckboxFilter.js

@@ -1,14 +1,10 @@
 import * as React from "react";
 import classNames from "classnames";
 import FilterSearch from "./FilterSearch";
-import { Checkbox, Menu, Radio } from "ui-rc";
-import { Empty, Tree } from "antd";
-
-// import {flattenKeys} from "ui-rc/dist/table/hooks/useFilter";
-
-import { flattenKeys } from "antd/es/table/hooks/useFilter";
-// import Empty from "ui-rc/dist/empty";
-// import Tree from "ui-rc/dist/tree";
+import { Checkbox, Menu, Radio, Empty } from "rc-master-ui";
+import { Tree } from "antd";
+import { flattenKeys } from "rc-master-ui/es/table/hooks/useFilter";
+// import Tree from "rc-master-ui/es/tree";
 
 function searchValueMatched(searchValue, text) {
   if (typeof text === 'string' || typeof text === 'number') {
@@ -153,10 +149,11 @@ const CheckboxFilter = props => {
     children: node.children?.map(item => getFilterData(item)) || []
   });
   const onCheckAll = e => {
-    console.log('e.target.checked', e.target.checked);
+    // console.log('e.target.checked', e.target.checked)
     if (e.target.checked) {
       const allFilterKeys = flattenKeys(options).map(key => String(key));
-      console.log('allFilterKeys', allFilterKeys);
+
+      // console.log('allFilterKeys', allFilterKeys)
       // setFilteredKeysSync(allFilterKeys);
       onSelect?.(allFilterKeys);
     } else {

package/es/ColumnsChoose.d.ts

@@ -1,10 +1,9 @@
 import type { Dispatch, SetStateAction } from "react";
 import React from "react";
-import type { TableColumnsType } from "ui-rc";
-export declare const BoxInputFilterColumn: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components").FastOmit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, never>> & string;
+import type { ColumnsType } from "./type";
 export type IColumnsChoose<RecordType> = {
     columns: any[];
-    setColumns: Dispatch<SetStateAction<TableColumnsType<RecordType>>>;
+    setColumns: Dispatch<SetStateAction<ColumnsType<RecordType>>>;
     t?: any;
 };
 export declare const ColumnsChoose: <RecordType extends object>(props: IColumnsChoose<RecordType>) => React.JSX.Element;

package/es/ColumnsChoose.js

@@ -1,91 +1,84 @@
-import React, { Fragment, useMemo, useState } from "react";
+import React, { Fragment, useEffect, useMemo, useState } from "react";
 import styled from "styled-components";
-import { Button, Input, Popover, Tooltip, Tree } from "antd";
+// import type { TreeDataNode} from "antd";
+import { Button, Input, Popover, Tooltip } from "antd";
 import { SettingOutlined } from "@ant-design/icons";
 import { getVisibleColumnKeys, updateColumns } from "./hooks";
-const {
-  Search
-} = Input;
+import Tree from "rc-master-ui/es/tree";
+import SearchOutlined from "@ant-design/icons/SearchOutlined";
 
-// const RowStyle = styled.div`
-//   padding: 6px 0;
-//
-//   height: 35px;
-//
-//   .ellipsis {
-//     overflow: hidden;
-//     white-space: nowrap;
-//     text-overflow: ellipsis;
-//     word-break: keep-all;
-//   }
-// `
+// const { Search } = Input;
 
 const BoxAction = styled.div.withConfig({
   displayName: "BoxAction",
   componentId: "es-grid-template__sc-1k89i9w-0"
 })(["border-top:1px solid #c4c4c4;padding-top:.75rem;display:flex;justify-content:end;gap:10px;.btn-action{background:none !important;border:none !important;&.btn-action-submit{color:#df4318;&:disabled{background-color:#f0f0f0 !important;}&:hover{color:#df4318 !important;}}&:hover{background-color:#f0f0f0 !important;}}"]);
-export const BoxInputFilterColumn = styled.div.withConfig({
-  displayName: "BoxInputFilterColumn",
-  componentId: "es-grid-template__sc-1k89i9w-1"
-})(["display:flex;position:relative;align-items:center;.input__value{z-index:1;border-radius:0;border-top:0;border-left:0;border-right:0;&:focus{box-shadow:none !important;}&.is-clearable{padding-right:25px !important;}}.input__clear-icon{cursor:pointer;position:absolute;right:5px;z-index:10;}"]);
 export const ColumnsChoose = props => {
   const {
     columns: propsColumns,
     setColumns: changeHiddenColumn
     // t,
-    // columnsGrouped,
-    // onChangeDisplay
-    // frozen
   } = props;
 
   // const dataList: { key: React.Key; title: string }[] = [];
 
-  const defaultColumns = useMemo(() => {
-    const rs = propsColumns.filter(it => it.key || it.dataIndex);
-    return rs;
+  // const defaultColumns = useMemo(() => {
+  //   return propsColumns.filter((it) => it.key || it.dataIndex && it.showColumnChoose !== false)
+  // }, [propsColumns])
+
+  // const columnsChooseRef: any = useRef()
+  // const searchRef: any = useRef()
+
+  const [columns, setColumns] = useState([]);
+  const [selectedKeys, setSelectedKeys] = useState([]);
+  useEffect(() => {
+    const defaultColumns = propsColumns.filter(it => it.key || it.dataIndex && it.showColumnChoose !== false);
+    const defaultSelectedKeys = getVisibleColumnKeys(propsColumns);
+    setSelectedKeys(defaultSelectedKeys);
+    setColumns(defaultColumns);
   }, [propsColumns]);
   const defaultSelectedKeys = useMemo(() => {
     return getVisibleColumnKeys(propsColumns);
   }, [propsColumns]);
 
-  // const columnsChooseRef: any = useRef()
-  // const searchRef: any = useRef()
+  // console.log('defaultSelectedKeys', defaultSelectedKeys)
 
-  const [columns] = useState(defaultColumns);
   const [clicked, setClicked] = useState(false);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
   // const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-  const [searchValue, setSearchValue] = useState('');
-  const [selectedKeys, setSelectedKeys] = useState(defaultSelectedKeys);
-  const treeData = useMemo(() => {
-    const loop = data => data.map(item => {
-      const strTitle = item.title;
-      const index = strTitle.indexOf(searchValue);
-      const beforeStr = strTitle.substring(0, index);
-      const afterStr = strTitle.slice(index + searchValue.length);
-      const title = index > -1 ? /*#__PURE__*/React.createElement("span", {
-        key: item.key
-      }, beforeStr, /*#__PURE__*/React.createElement("span", {
-        className: "site-tree-search-value"
-      }, searchValue), afterStr) : /*#__PURE__*/React.createElement("span", {
-        key: item.key
-      }, strTitle);
-      if (item.children) {
-        return {
-          title,
-          key: item.key,
-          children: loop(item.children)
-        };
-      }
-      return {
-        title,
-        key: item.key
-      };
-    });
+  // const [searchValue, setSearchValue] = useState('');
+
+  // const treeData = useMemo(() => {
+  //   const loop = (data: TreeDataNode[]): TreeDataNode[] =>
+  //     data.map((item) => {
+  //       const strTitle = item.title as string;
+  //       const index = strTitle.indexOf(searchValue);
+  //       const beforeStr = strTitle.substring(0, index);
+  //       const afterStr = strTitle.slice(index + searchValue.length);
+  //       const title =
+  //         index > -1 ? (
+  //           <span key={item.key}>
+  //             {beforeStr}
+  //             <span className="site-tree-search-value">{searchValue}</span>
+  //             {afterStr}
+  //           </span>
+  //         ) : (
+  //           <span key={item.key}>{strTitle}</span>
+  //         );
+  //       if (item.children) {
+  //         return { title, key: item.key, children: loop(item.children) };
+  //       }
+  //
+  //       return {
+  //         title,
+  //         key: item.key,
+  //       };
+  //     });
+  //
+  //   // return loop(defaultData);
+  //   return loop(columns as any);
+  // }, [searchValue, columns]);
 
-    // return loop(defaultData);
-    return loop(columns);
-  }, [searchValue]);
   const hide = () => {
     setClicked(false);
   };
@@ -112,10 +105,9 @@ export const ColumnsChoose = props => {
   //   return parentKey!
   // }
 
-  const onChange = e => {
-    const {
-      value
-    } = e.target;
+  // const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const onChange = () => {
+    // const { value } = e.target
     // const newExpandedKeys = dataList
     //   .map((item) => {
     //     if (item.title.indexOf(value) > -1) {
@@ -125,14 +117,15 @@ export const ColumnsChoose = props => {
     //   })
     //   .filter((item, i, self): item is React.Key => !!(item && self.indexOf(item) === i))
     // setExpandedKeys(newExpandedKeys)
-    setSearchValue(value);
+
+    // setSearchValue(value)
     setAutoExpandParent(true);
   };
   const onCheck = keys => {
     setSelectedKeys(keys);
   };
   const handleAccept = () => {
-    const rs1 = updateColumns(columns, selectedKeys);
+    const rs1 = updateColumns(propsColumns, selectedKeys);
     changeHiddenColumn(rs1);
     hide();
   };
@@ -146,18 +139,21 @@ export const ColumnsChoose = props => {
       style: {
         minWidth: 250
       }
-    }, /*#__PURE__*/React.createElement(Search, {
+    }, /*#__PURE__*/React.createElement(Input, {
       style: {
         marginBottom: 8
       },
       placeholder: "Search",
+      prefix: /*#__PURE__*/React.createElement(SearchOutlined, null),
       onChange: onChange
     }), /*#__PURE__*/React.createElement(Tree, {
       onExpand: onExpand
       // expandedKeys={expandedKeys}
       ,
-      autoExpandParent: autoExpandParent,
-      treeData: treeData,
+      autoExpandParent: autoExpandParent
+      // treeData={treeData}
+      ,
+      treeData: columns,
       defaultExpandAll: true,
       checkable: true
       // onSelect={(keys, info) => {

package/es/FilterSearch.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import SearchOutlined from '@ant-design/icons/SearchOutlined';
-import { Input } from 'ui-rc';
+import { Input } from 'rc-master-ui';
 const FilterSearch = props => {
   const {
     value,

package/es/{GridTable.d.ts → InternalTable.d.ts}

@@ -3,5 +3,5 @@ import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import './styles.scss';
 import type { GridTableProps } from "./type";
-declare const GridTable: <RecordType extends object>(props: GridTableProps<RecordType>) => React.JSX.Element;
-export default GridTable;
+declare const InternalTable: <RecordType extends object>(props: GridTableProps<RecordType>) => React.JSX.Element;
+export default InternalTable;

package/es/InternalTable.js

@@ -0,0 +1,185 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import React, { Fragment, useEffect, useState } from 'react';
+import { Table } from "rc-master-ui";
+import dayjs from "dayjs";
+import 'dayjs/locale/es';
+import 'dayjs/locale/vi';
+import "./styles.scss";
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import styled from "styled-components";
+import TableGrid from "./TableGrid";
+import { Resizable } from "react-resizable";
+// import {ColumnsChoose} from "./ColumnsChoose";
+
+dayjs.extend(customParseFormat);
+const ResizableTitle = props => {
+  const {
+    onResize,
+    width,
+    ...restProps
+  } = props;
+  if (!width) {
+    return /*#__PURE__*/React.createElement("th", restProps);
+  }
+  return (
+    /*#__PURE__*/
+    // @ts-ignore
+    React.createElement(Resizable, {
+      width: width,
+      height: 0,
+      handle: /*#__PURE__*/React.createElement("span", {
+        className: "react-resizable-handle",
+        onClick: e => {
+          e.stopPropagation();
+        }
+      }),
+      onResize: onResize,
+      draggableOpts: {
+        enableUserSelectHack: false
+      }
+    }, /*#__PURE__*/React.createElement("th", restProps))
+  );
+};
+const GridStyle = styled.div.withConfig({
+  displayName: "GridStyle",
+  componentId: "es-grid-template__sc-1fs85vo-0"
+})([".ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:", ";bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:", ";bottom:0;visibility:visible;right:0;}}"], props => props.heightTable ? typeof props.heightTable === 'string' ? props.heightTable : `${props.heightTable}px` : undefined, props => props.heightTable ? `${props.heightTable}px` : undefined);
+const InternalTable = props => {
+  const {
+    columns,
+    // title,
+    dataSource,
+    // toolbarItems,
+    // showColumnChoose,
+    ...rest
+  } = props;
+  const [tmpColumns, setColumns] = useState([]);
+  useEffect(() => {
+    const rs = columns ? [Table.SELECTION_COLUMN, ...columns] : [];
+    setColumns(rs);
+  }, [columns]);
+  const handleResize = indexPath => (e, {
+    size
+  }) => {
+    const updateColumns = (cols, path) => {
+      const [currentIndex, ...restPath] = path;
+      return cols.map((col, idx) => {
+        if (idx === currentIndex) {
+          if (restPath.length === 0) {
+            // Cập nhật width của cột cuối cùng trong path
+            // return { ...col, width: size.width }
+
+            // Kiểm tra minWidth trước khi cập nhật width
+            if (col.minWidth && size.width < col.minWidth) {
+              e.preventDefault();
+              return col; // Không cập nhật nếu nhỏ hơn minWidth
+            }
+
+            // Kiểm tra minWidth trước khi cập nhật width
+            if (col.maxWidth && size.width > col.maxWidth) {
+              e.preventDefault();
+              return col; // Không cập nhật nếu nhỏ hơn minWidth
+            }
+            return {
+              ...col,
+              width: size.width
+            };
+          } else if (col.children) {
+            // Tiếp tục cập nhật các cấp con
+            return {
+              ...col,
+              children: updateColumns(col.children, restPath)
+            };
+          }
+        }
+        // e.preventDefault()
+        return col;
+      });
+    };
+    setColumns(prevColumns => updateColumns(prevColumns, indexPath));
+  };
+  const addResizeHandlers = React.useCallback((cols, parentPath = []) => {
+    return cols.map((col, index) => {
+      const currentPath = [...parentPath, index];
+      if (!col?.dataIndex && !col.key) {
+        return col;
+      }
+      if (col.children) {
+        return {
+          ...col,
+          title: col.headerText ?? col.title,
+          ellipsis: col.ellipsis !== false,
+          children: addResizeHandlers(col.children, currentPath)
+        };
+      }
+      return {
+        ...col,
+        title: col.headerText ?? col.title,
+        ellipsis: col.ellipsis !== false,
+        onHeaderCell: () => ({
+          width: col.width,
+          onResize: handleResize(currentPath)
+        })
+      };
+    });
+  }, []);
+  const resizableColumns = React.useMemo(() => {
+    return addResizeHandlers(tmpColumns);
+  }, [addResizeHandlers, tmpColumns]);
+  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(GridStyle, {
+    heightTable: props.style?.minHeight,
+    style: {
+      position: 'relative'
+    }
+  }, /*#__PURE__*/React.createElement(TableGrid, _extends({}, rest, {
+    dataSource: dataSource,
+    components: {
+      header: {
+        cell: ResizableTitle
+      }
+    },
+    columns: resizableColumns,
+    setColumns: setColumns,
+    showSorterTooltip: {
+      target: 'sorter-icon'
+    }
+
+    // title={() => {
+    //   return (
+    //     <Fragment>
+    //       <div>
+    //         {title?.(dataSource as any)}
+    //       </div>
+    //
+    //
+    //       {(toolbarItems || showColumnChoose !== false) && (
+    //         <div style={{display: 'flex', justifyContent: 'space-between'}}>
+    //
+    //           <Toolbar
+    //             style={{width: '100%'}}
+    //             items={toolbarItems ?? []}
+    //             mode={'responsive'}
+    //             // mode={'scroll'}
+    //             onClick={(val: any) => {
+    //               console.log(val)
+    //             }}
+    //           />
+    //
+    //           {showColumnChoose && (
+    //             <ColumnsChoose
+    //               columns={resizableColumns}
+    //               setColumns={setColumns}
+    //             />
+    //           )}
+    //
+    //           <div />
+    //         </div>
+    //       )}
+    //
+    //
+    //     </Fragment>
+    //   )
+    // }}
+  }))));
+};
+export default InternalTable;

package/es/LoadingSpinner.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+declare const ComponentSpinner: () => React.JSX.Element;
+export default ComponentSpinner;

package/es/LoadingSpinner.js

@@ -0,0 +1,20 @@
+import * as React from 'react';
+import styled from "styled-components";
+const SpinnerStyle = styled.div.withConfig({
+  displayName: "SpinnerStyle",
+  componentId: "es-grid-template__sc-180f2ml-0"
+})(["width:1em;height:1em;font-size:20px;display:inline-block;transition:transform 0.3s ease,opacity 0.3s ease;transform-origin:50% 50%;line-height:1;.loading{position:absolute;top:50%;inset-inline-start:50%;margin:-10px;width:55px;height:55px;border-radius:50%;border:3px solid transparent;-webkit-box-sizing:border-box;box-sizing:border-box;.effect-1,.effect-2,.effect-3{width:36px;height:36px;border-radius:50%;border:3px solid transparent;border-left:3px solid #eb4619;-webkit-box-sizing:border-box;box-sizing:border-box;}.effect-1{position:absolute;animation:rotate 1s ease infinite;}.effect-2{position:absolute;animation:rotateOpacity 1s ease infinite 0.1s;}.effect-3{-webkit-animation:rotateOpacity 1s ease infinite 0.2s;animation:rotateOpacity 1s ease infinite 0.2s;}.loading .effects{transition:all 0.3s ease;}}@keyframes rotate{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);}100%{-webkit-transform:rotate(1turn);transform:rotate(1turn);}}@keyframes rotateOpacity{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg);opacity:0.1;}100%{-webkit-transform:rotate(1turn);transform:rotate(1turn);opacity:1;}}"]);
+const ComponentSpinner = () => {
+  return /*#__PURE__*/React.createElement(SpinnerStyle, {
+    className: "fallback-spinner"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "loading"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "effect-1 effects"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "effect-2 effects"
+  }), /*#__PURE__*/React.createElement("div", {
+    className: "effect-3 effects"
+  })));
+};
+export default ComponentSpinner;

package/es/TableGrid.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import 'dayjs/locale/es';
+import 'dayjs/locale/vi';
+import './styles.scss';
+import type { GridTableProps } from "./type";
+type GridProps<T> = GridTableProps<T> & {
+    setColumns: any;
+};
+declare const TableGrid: <RecordType extends object>(props: GridProps<RecordType>) => React.JSX.Element;
+export default TableGrid;