es-grid-template 1.2.3 → 1.2.5

package/assets/index.css

@@ -21,12 +21,6 @@
   overflow: hidden !important;
   border-inline-end: 0 !important;
 }
-.ui-rc-table-wrapper .ui-rc-table {
-  line-height: 20px;
-}
-.ui-rc-table-wrapper .ui-rc-table .ui-rc-table-cell {
-  min-height: 35px;
-}
 .ui-rc-table-wrapper .ui-rc-table .ui-rc-table-cell .ui-rc-table-filter-column .ui-rc-dropdown-trigger.ui-rc-table-filter-trigger {
   margin-left: 0;
 }
@@ -254,9 +248,6 @@
 .ui-rc-table-wrapper.grid-editable .ui-rc-table.ui-rc-table-ping-right .ui-rc-table-tbody .rc-ui-cell-editable.cell-border-end {
   z-index: 1;
 }
-.ui-rc-table-wrapper.grid-editable .ui-rc-table.ui-rc-table-small .ui-rc-table-selection-column {
-  padding: 6px 8px;
-}
 .ui-rc-table-wrapper.grid-editable .ui-rc_cell-content {
   user-select: none;
   padding: 7px 8px;
@@ -333,77 +324,66 @@
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-0) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 0px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-0) .ui-rc_cell-content {
   padding-left: 8px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-1) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 10px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-1) .ui-rc_cell-content {
   padding-left: 33px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-2) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 20px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-2) .ui-rc_cell-content {
   padding-left: 58px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-3) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 30px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-3) .ui-rc_cell-content {
   padding-left: 83px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-4) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 40px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-4) .ui-rc_cell-content {
   padding-left: 108px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-5) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 50px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-5) .ui-rc_cell-content {
   padding-left: 133px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-6) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 60px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-6) .ui-rc_cell-content {
   padding-left: 158px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-7) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 70px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-7) .ui-rc_cell-content {
   padding-left: 183px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-8) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 80px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-8) .ui-rc_cell-content {
   padding-left: 208px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-9) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 90px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-9) .ui-rc_cell-content {
   padding-left: 233px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-10) .ui-rc-table-row-expand-icon {
   position: absolute;
-  padding-left: 100px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-row .ui-rc-table-cell:has(.indent-level-10) .ui-rc_cell-content {
   padding-left: 258px;

package/assets/index.scss

@@ -42,6 +42,14 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     //font-weight: 500;
   }
 
+  .ui-rc-table {
+    .#{$prefix}-table-cell {
+      &.#{$prefix}-table-selection-column {
+        //padding: 6px 8px !important;
+        //padding: 6px 8px !important;
+      }
+    }
+  }
 
 
   &.table-none-column-select {
@@ -57,9 +65,12 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
   }
 
   .#{$prefix}-table {
-    line-height: 20px;
+
+    //line-height: 20px;
+
     .#{$prefix}-table-cell {
-      min-height: 35px;
+      //min-height: 35px;
+      //height: 35px;
 
       .#{$prefix}-table-filter-column {
         .#{$prefix}-dropdown-trigger.#{$prefix}-table-filter-trigger {
@@ -324,6 +335,13 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
 .#{$prefix}-table-wrapper {
 
+  .#{$prefix}-table.#{$prefix}-table-small {
+    .#{$prefix}-table-selection-column{
+      //padding: 8px 8px;
+      //padding: 6px 8px;
+    }
+  }
+
   &.grid-editable {
 
     .#{$prefix}-table-row {
@@ -528,7 +546,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
     .#{$prefix}-table.#{$prefix}-table-small {
       .#{$prefix}-table-selection-column{
         //padding: 8px 8px;
-        padding: 6px 8px;
+        //padding: 6px 8px;
       }
     }
 
@@ -620,7 +638,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
               .#{$prefix}-table-row-expand-icon {
                 position: absolute;
                 //.ui-rc_content {
-                padding-left: $i * 10px;
+                //padding-left: $i * 10px;
                 //}
               }
 

package/es/grid-component/ColumnsChoose.d.ts

@@ -5,5 +5,6 @@ export type IColumnsChoose<RecordType> = {
     columnsGroup?: string[];
     triggerChangeColumns?: (columns: ColumnsTable<RecordType>, type: string) => void;
     t?: any;
+    triggerChangeKeys?: any;
 };
 export declare const ColumnsChoose: <RecordType extends object>(props: IColumnsChoose<RecordType>) => React.JSX.Element;

package/es/grid-component/ColumnsChoose.js

@@ -1,4 +1,326 @@
-import React, { Fragment, useMemo, useState } from "react";
+// import React, {Fragment, useMemo, useState} from "react"
+//
+// import styled from "styled-components"
+// import {Button, Input, Popover, Tooltip} from "antd";
+// import {SettingOutlined} from "@ant-design/icons";
+// import {
+//   getVisibleColumnKeys,
+//   updateColumns
+// } from "./hooks";
+//
+// // import type {TableColumnsType} from "rc-master-ui";
+// import Tree from "rc-master-ui/es/tree";
+// import SearchOutlined from "@ant-design/icons/SearchOutlined";
+// import type {ColumnsTable} from "./type";
+// import useMergedState from "rc-util/lib/hooks/useMergedState";
+//
+//
+// const  BoxAction = styled.div`
+//   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 type IColumnsChoose<RecordType> = {
+//   columns: ColumnsTable<RecordType>
+//   columnsGroup?: string[]
+//   triggerChangeColumns?: (columns: ColumnsTable<RecordType>, type: string) => void
+//   t?: any
+//
+// }
+//
+//
+// export const ColumnsChoose = <RecordType extends object>(props: IColumnsChoose<RecordType>) => {
+//   const {
+//     columns: propsColumns,
+//     triggerChangeColumns,
+//     t,
+//     columnsGroup,
+//   } = props
+//
+//   // const dataList: { key: React.Key; title: string }[] = [];
+//
+//   // 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<TableColumnsType>([])
+//
+//   // const [selectedKeys, setSelectedKeys] = useState<string[]>([]);
+//
+//   // const [isManualUpdate, setIsManualUpdate] = useState(false);
+//
+//
+//   // useEffect(() => {
+//   //
+//   //   const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
+//   //   setColumns(defaultColumns as TableColumnsType)
+//   //
+//   // }, [propsColumns])
+//
+//   const columns  = useMemo(() => {
+//
+//     // return  propsColumns.filter((it) => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field as string))
+//     return  propsColumns.filter((it) => (it.key || it.dataIndex) && it.showInColumnChoose !== false)
+//     // setColumns(defaultColumns as TableColumnsType)
+//   }, [columnsGroup, propsColumns])
+//
+//
+//   // useEffect(() => {
+//   //
+//   //   const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
+//   //
+//   //   const defaultSelectedKeys = getVisibleColumnKeys(defaultColumns)
+//   //
+//   //   if (!isManualUpdate) {
+//   //     setSelectedKeys(defaultSelectedKeys)
+//   //   }
+//   //   setIsManualUpdate(false);
+//   //
+//   //
+//   // }, [isManualUpdate, propsColumns])
+//
+//   const defaultSelectedKeys =  React.useMemo(() => {
+//
+//     const rs = propsColumns.filter((it) => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field as string))
+//     return getVisibleColumnKeys(rs)
+//
+//   },  [columnsGroup, propsColumns])
+//
+//   const [mergedSelectedKeys, setMergedSelectedKeys] = useMergedState(
+//     defaultSelectedKeys || [],
+//     {
+//       value: defaultSelectedKeys,
+//     },
+//   );
+//
+//   //
+//   // const defaultSelectedKeys = useMemo(() => {
+//   //
+//   //   return getVisibleColumnKeys(propsColumns)
+//   //
+//   // }, [propsColumns])
+//
+//
+//   const [clicked, setClicked] = useState(false);
+//   const [autoExpandParent, setAutoExpandParent] = useState(true);
+//
+//
+//   // 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]);
+//
+//
+//   const hide = () => {
+//     setClicked(false)
+//   }
+//
+//   const handleClickChange = (open: boolean) => {
+//     setClicked(open)
+//   }
+//
+//   const onExpand = () => {
+//     // setExpandedKeys(newExpandedKeys)
+//     setAutoExpandParent(false)
+//   }
+//
+//   // const getParentKey = (key: React.Key, tree: TreeDataNode[]): React.Key => {
+//   //   let parentKey: React.Key
+//   //   for (let i = 0; i < tree.length; i++) {
+//   //     const node = tree[i]
+//   //     if (node.children) {
+//   //       if (node.children.some((item) => item.key === key)) {
+//   //         parentKey = node.key
+//   //       } else if (getParentKey(key, node.children)) {
+//   //         parentKey = getParentKey(key, node.children)
+//   //       }
+//   //     }
+//   //   }
+//   //   return parentKey!
+//   // }
+//
+//   // const onChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+//   const onChange = () => {
+//     // const { value } = e.target
+//     // const newExpandedKeys = dataList
+//     //   .map((item) => {
+//     //     if (item.title.indexOf(value) > -1) {
+//     //       return getParentKey(item.key, defaultData)
+//     //     }
+//     //     return null
+//     //   })
+//     //   .filter((item, i, self): item is React.Key => !!(item && self.indexOf(item) === i))
+//     // setExpandedKeys(newExpandedKeys)
+//
+//     // setSearchValue(value)
+//     setAutoExpandParent(true)
+//   };
+//
+//   const onCheck = (keys: string[]) => {
+//
+//     console.log('keys', keys)
+//     // setSelectedKeys(keys)
+//     setMergedSelectedKeys(keys)
+//     // setIsManualUpdate(true)
+//
+//   }
+//
+//   const handleAccept = () => {
+//
+//     console.log('mergedSelectedKeys', mergedSelectedKeys)
+//
+//     // const rs1  =  updateColumns(propsColumns, selectedKeys)
+//     const rs1  =  updateColumns(propsColumns, mergedSelectedKeys)
+//
+//     console.log('rs1', rs1)
+//
+//     triggerChangeColumns?.(rs1, 'columnChoose')
+//
+//     hide()
+//
+//   }
+//
+//   const handleCancel = () => {
+//     // setSelectedKeys(defaultSelectedKeys)
+//     hide()
+//   }
+//
+//
+//   return (
+//     <Fragment>
+//       <Popover
+//         placement={'bottomLeft'}
+//         content={
+//           <div style={{minWidth: 250}}>
+//             <Input style={{ marginBottom: 8 }} placeholder={t ? t("Search") : 'Search'} prefix={<SearchOutlined />} onChange={onChange} />
+//
+//             <Tree
+//               onExpand={onExpand}
+//               // expandedKeys={expandedKeys}
+//               autoExpandParent={autoExpandParent}
+//               // treeData={treeData}
+//               treeData={columns}
+//               defaultExpandAll={true}
+//               checkable={true}
+//               // onSelect={(keys, info) => {
+//               //   const key = info.node.key
+//               //
+//               //   const find = findItemByKey(columns, 'key', key)
+//               //
+//               //   // const tmpColumn
+//               //
+//               //   // if (selectedKeys.includes(key as string)) {
+//               //   //   const rssss  = findKeyPath(columns, key as string)
+//               //   //   const rs = selectedKeys.filter(item => !rssss.includes(item));
+//               //   //
+//               //   //   setSelectedKeys(rs)
+//               //   // } else {
+//               //
+//               //     // const rs  = [...selectedKeys, keys[0]]
+//               //
+//               //     // setSelectedKeys(keys)
+//               //   // }
+//               // }}
+//               onCheck={(keys) => onCheck(keys as string[])}
+//
+//
+//               multiple={true}
+//               // checkedKeys={selectedKeys}
+//
+//               defaultCheckedKeys={mergedSelectedKeys}
+//               // defaultCheckedKeys={defaultSelectedKeys}
+//               // selectedKeys={[]}
+//
+//               height={window.innerHeight - 200}
+//
+//             />
+//
+//
+//             <BoxAction className={'px-1'}>
+//               <Button
+//                 // className={classnames('btn-action btn-action-submit', {
+//                 //   // disable: !columns.find((item) => item.visible !== false || item.visible)
+//                 // })}
+//                 onClick={handleAccept}
+//                 // disabled={!columns.find((item) => item.visible !== false || item.visible)}
+//               >
+//                 {t ? t('OK') : 'OK'}
+//                 {/*{'OK'}*/}
+//               </Button>
+//
+//               {/*<Button className={'btn-action btn-action-cancel'} onClick={hide}  >{('Cancel') }</Button>*/}
+//               <Button className={'btn-action btn-action-cancel'} onClick={handleCancel}  >{t ? t('Cancel') : 'Cancel' }</Button>
+//             </BoxAction>
+//           </div>
+//         }
+//         trigger="click"
+//         open={clicked}
+//         onOpenChange={handleClickChange}
+//         arrow={false}
+//       >
+//         <Tooltip arrow={false} title={'Cài đặt'} >
+//           <SettingOutlined size={16} color={'#555555'} style={{fontSize: 16, color: '#555555'}} />
+//         </Tooltip>
+//
+//       </Popover>
+//     </Fragment>
+//   )
+// }
+
+import React, { Fragment, useEffect, useMemo, useState } from "react";
 import styled from "styled-components";
 import { Button, Input, Popover, Tooltip } from "antd";
 import { SettingOutlined } from "@ant-design/icons";
@@ -7,7 +329,6 @@ import { getVisibleColumnKeys, updateColumns } from "./hooks";
 // import type {TableColumnsType} from "rc-master-ui";
 import Tree from "rc-master-ui/es/tree";
 import SearchOutlined from "@ant-design/icons/SearchOutlined";
-import useMergedState from "rc-util/es/hooks/useMergedState";
 const BoxAction = styled.div.withConfig({
   displayName: "BoxAction",
   componentId: "es-grid-template__sc-1ix8yky-0"
@@ -16,6 +337,7 @@ export const ColumnsChoose = props => {
   const {
     columns: propsColumns,
     triggerChangeColumns,
+    triggerChangeKeys,
     t,
     columnsGroup
   } = props;
@@ -30,10 +352,8 @@ export const ColumnsChoose = props => {
   // const searchRef: any = useRef()
 
   // const [columns, setColumns] = useState<TableColumnsType>([])
-
-  // const [selectedKeys, setSelectedKeys] = useState<string[]>([]);
-
-  // const [isManualUpdate, setIsManualUpdate] = useState(false);
+  const [selectedKeys, setSelectedKeys] = useState([]);
+  const [isManualUpdate, setIsManualUpdate] = useState(false);
 
   // useEffect(() => {
   //
@@ -43,40 +363,22 @@ export const ColumnsChoose = props => {
   // }, [propsColumns])
 
   const columns = useMemo(() => {
-    // return  propsColumns.filter((it) => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field as string))
-    return propsColumns.filter(it => (it.key || it.dataIndex) && it.showInColumnChoose !== false);
+    return propsColumns.filter(it => it.key || it.dataIndex && it.showInColumnChoose !== false);
     // setColumns(defaultColumns as TableColumnsType)
-  }, [columnsGroup, propsColumns]);
-
-  // useEffect(() => {
-  //
-  //   const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
-  //
-  //   const defaultSelectedKeys = getVisibleColumnKeys(defaultColumns)
-  //
-  //   if (!isManualUpdate) {
-  //     setSelectedKeys(defaultSelectedKeys)
-  //   }
-  //   setIsManualUpdate(false);
-  //
-  //
-  // }, [isManualUpdate, propsColumns])
-
-  const defaultSelectedKeys = React.useMemo(() => {
-    const rs = propsColumns.filter(it => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field));
-    return getVisibleColumnKeys(rs);
-  }, [columnsGroup, propsColumns]);
-  const [mergedSelectedKeys, setMergedSelectedKeys] = useMergedState(defaultSelectedKeys || [], {
-    value: defaultSelectedKeys
-  });
-
-  //
-  // const defaultSelectedKeys = useMemo(() => {
-  //
-  //   return getVisibleColumnKeys(propsColumns)
-  //
-  // }, [propsColumns])
-
+  }, [propsColumns]);
+  useEffect(() => {
+    // const defaultColumns = propsColumns.filter((it) => it.key || it.dataIndex && it.showInColumnChoose !== false)
+    const defaultColumns = propsColumns.filter(it => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field));
+    const defaultSelectedKeys = getVisibleColumnKeys(defaultColumns);
+    if (!isManualUpdate) {
+      setSelectedKeys(defaultSelectedKeys);
+    }
+    setIsManualUpdate(false);
+  }, [propsColumns]);
+  const defaultSelectedKeys = useMemo(() => {
+    const defaultColumns = propsColumns.filter(it => (it.key || it.dataIndex) && it.showInColumnChoose !== false && !columnsGroup?.includes(it.field));
+    return getVisibleColumnKeys(defaultColumns);
+  }, [propsColumns]);
   const [clicked, setClicked] = useState(false);
   const [autoExpandParent, setAutoExpandParent] = useState(true);
 
@@ -154,19 +456,17 @@ export const ColumnsChoose = props => {
     setAutoExpandParent(true);
   };
   const onCheck = keys => {
-    console.log('keys', keys);
-    // setSelectedKeys(keys)
-    setMergedSelectedKeys(keys);
-    // setIsManualUpdate(true)
+    setSelectedKeys(keys);
+    setIsManualUpdate(true);
   };
   const handleAccept = () => {
-    // const rs1  =  updateColumns(propsColumns, selectedKeys)
-    const rs1 = updateColumns(propsColumns, mergedSelectedKeys);
+    const rs1 = updateColumns(propsColumns, selectedKeys);
+    triggerChangeKeys?.(selectedKeys);
     triggerChangeColumns?.(rs1, 'columnChoose');
     hide();
   };
   const handleCancel = () => {
-    // setSelectedKeys(defaultSelectedKeys)
+    setSelectedKeys(defaultSelectedKeys);
     hide();
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(Popover, {
@@ -213,15 +513,12 @@ export const ColumnsChoose = props => {
       // }}
       ,
       onCheck: keys => onCheck(keys),
-      multiple: true
-      // checkedKeys={selectedKeys}
-      ,
-
-      defaultCheckedKeys: mergedSelectedKeys
+      multiple: true,
+      checkedKeys: selectedKeys,
+      defaultCheckedKeys: selectedKeys
       // defaultCheckedKeys={defaultSelectedKeys}
-      // selectedKeys={[]}
       ,
-
+      selectedKeys: [],
       height: window.innerHeight - 200
     }), /*#__PURE__*/React.createElement(BoxAction, {
       className: 'px-1'
@@ -243,12 +540,5 @@ export const ColumnsChoose = props => {
   }, /*#__PURE__*/React.createElement(Tooltip, {
     arrow: false,
     title: 'Cài đặt'
-  }, /*#__PURE__*/React.createElement(SettingOutlined, {
-    size: 16,
-    color: '#555555',
-    style: {
-      fontSize: 16,
-      color: '#555555'
-    }
-  }))));
+  }, /*#__PURE__*/React.createElement(SettingOutlined, null))));
 };

package/es/grid-component/EditableCell.js

@@ -6,6 +6,7 @@ import { checkDecimalSeparator, checkThousandSeparator, checkFieldKey, convertAr
 convertLabelToTitle,
 // customWeekStartEndFormat,
 getDatepickerFormat, getTemplate, isDisable, isEmpty, isNullOrUndefined, customWeekStartEndFormat, convertDayjsToDate, parseBooleanToValue, isColor, genPresets
+// isEditable,
 // convertDayjsToDate
 } from "./hooks";
 // import moment from "moment";
@@ -79,10 +80,11 @@ const EditableCell = props => {
       toolbarClick,
       loadOptions,
       validateOption,
-      options: selectOptions
+      options: propsOptions
     } = column.editSelectSettings || {};
     const isInvalid = false;
     const keySelect = checkFieldKey(column?.editSelectSettings?.fieldKey);
+    const selectOptions = typeof propsOptions === 'function' ? propsOptions(record, column.dataIndex) : propsOptions;
     const options = validateOption ? validateOption(record, column.dataIndex) : selectOptions ?? [];
     const optionsTree = validateOption ? convertArrayWithIndent(validateOption(record, column.dataIndex)) : selectOptions ? convertArrayWithIndent(selectOptions) : [];
     switch (editType) {

package/es/grid-component/InternalTable.js

@@ -97,6 +97,7 @@ const InternalTable = props => {
   React.useEffect(() => {
     setColumns(propsColumns);
   }, [propsColumns]);
+  // }, [!!propsColumns.length && !!propsColumns])
 
   // const [data, setData] = useState<RecordType[]>([]);
 
@@ -147,8 +148,14 @@ const InternalTable = props => {
   }, [rowKey]);
 
   // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
-  const triggerChangeColumns = newColumns => {
+  const triggerChangeColumns = (newColumns, type) => {
     setColumns(newColumns);
+    if (tableRef.current && type === 'columnChoose') {
+      tableRef.current.scrollTo({
+        left: 0.1,
+        behavior: "smooth"
+      });
+    }
     onChooseColumns?.({
       showColumns: [],
       columns: [],