es-grid-template 1.2.4 → 1.2.5

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

@@ -148,9 +148,9 @@ const InternalTable = props => {
   }, [rowKey]);
 
   // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
-  const triggerChangeColumns = newColumns => {
+  const triggerChangeColumns = (newColumns, type) => {
     setColumns(newColumns);
-    if (tableRef.current) {
+    if (tableRef.current && type === 'columnChoose') {
       tableRef.current.scrollTo({
         left: 0.1,
         behavior: "smooth"

package/es/grid-component/hooks/utils.d.ts

@@ -68,3 +68,4 @@ export declare const removeColumns: <RecordType>(columns: ColumnsTable<RecordTyp
 export declare const convertFlatColumn: (array: ColumnsTable) => ColumnsTable[];
 export declare const convertColumns: <RecordType>(cols: ColumnsTable<RecordType>) => ColumnsTable<RecordType>;
 export declare const checkChild: (inputArray: any[]) => boolean;
+export declare const isEditable: <RecordType>(column: ColumnEditType, rowData: RecordType) => boolean | ((rowData: any) => boolean);

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

@@ -772,4 +772,10 @@ export const convertColumns = cols => {
 };
 export const checkChild = inputArray => {
   return inputArray.some(item => item.children && item.children.length > 0);
+};
+export const isEditable = (column, rowData) => {
+  if (column && typeof column.editEnable === 'function') {
+    return column.editEnable(rowData);
+  }
+  return column?.editEnable;
 };

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

@@ -13,7 +13,7 @@ import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import TableGrid from "../TableGrid";
-import { addRows8, checkChild, findAllChildrenKeys, findItemByKey, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, isObjEmpty, newGuid, totalFixedWidth, updateArrayByKey } from "../hooks";
+import { addRows8, checkChild, findAllChildrenKeys, findItemByKey, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, isEditable, isObjEmpty, newGuid, totalFixedWidth, updateArrayByKey } from "../hooks";
 import Message from "../../Message/Message";
 
 // import Command from "../Command";
@@ -49,6 +49,7 @@ const GridEdit = props => {
     defaultValue,
     expandable,
     onCellClick,
+    rowEditable,
     ...rest
   } = props;
   const {
@@ -1365,7 +1366,8 @@ const GridEdit = props => {
           title: getValueCell(column, record[column.field], format),
           'data-col-index': colIndex,
           'data-row-index': rowNumber,
-          editing: isEditing(record),
+          editing: isEditing(record) && rowEditable?.(record) !== false && isEditable(column, record) !== false,
+          // editing: isEditing(record) && rowEditable?.(record) !== false,
           tabIndex: (rowIndex ?? 0) * columns.length + colIndex,
           style: isPasteDragging ? {
             cursor: "crosshair"
@@ -1384,7 +1386,7 @@ const GridEdit = props => {
           onMouseUp: handleMouseUp
         }, /*#__PURE__*/React.createElement("div", {
           className: 'ui-rc_content'
-        }, renderContent(column, value, record, rowIndex, format)), selectedCells && selectedCells.size > 0 && getLastSelectCell(selectedCells).row === rowNumber && getLastSelectCell(selectedCells).col === colIndex && !isSelectDragging &&
+        }, renderContent(column, value, record, rowIndex, format)), selectedCells && selectedCells.size > 0 && getLastSelectCell(selectedCells).row === rowNumber && getLastSelectCell(selectedCells).col === colIndex && isEditable(column, record) !== false && !isSelectDragging &&
         /*#__PURE__*/
         // showDraggingPoint &&
         React.createElement("div", {

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

@@ -46,7 +46,7 @@ export type ColumnSelectTable = {
 };
 export type IEditSelectSettings = {
     fieldKey?: string;
-    options: any[];
+    options: any[] | ((rowData: any, field: string) => any[]);
     /**  get value form other field **/
     fieldValue?: string;
     /** get label form other field **/
@@ -114,6 +114,7 @@ export type ColumnType<RecordType> = Omit<RcColumnType<RecordType>, 'headerTempl
 export type ColumnEditType<RecordType = AnyObject> = Omit<ColumnType<RecordType>, 'children'> & {
     editType?: EditType | ((rowData?: RecordType) => EditType);
     disable?: boolean | ((rowData: any) => boolean);
+    editEnable?: boolean | ((rowData: any) => boolean);
     isClearable?: boolean;
     maxDate?: any;
     minDate?: any;
@@ -185,6 +186,7 @@ export interface TableEditProps<RecordType = AnyObject> extends Omit<TableProps<
     onCellPaste?: ICellPasteModel<RecordType>;
     onCellChange?: (args: CellChangeArgs<RecordType>, handleCallback: (rowData: any, index: any, value?: any) => void) => void;
     onCellClick?: (args: ICellClick, callback?: any) => void;
+    rowEditable?: (rowData: RecordType) => boolean;
 }
 export type ICellClick = {
     index: number;

package/lib/grid-component/EditableCell.js

@@ -81,10 +81,11 @@ const EditableCell = props => {
       toolbarClick,
       loadOptions,
       validateOption,
-      options: selectOptions
+      options: propsOptions
     } = column.editSelectSettings || {};
     const isInvalid = false;
     const keySelect = (0, _hooks.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 ? (0, _hooks.convertArrayWithIndent)(validateOption(record, column.dataIndex)) : selectOptions ? (0, _hooks.convertArrayWithIndent)(selectOptions) : [];
     switch (editType) {

package/lib/grid-component/InternalTable.js

@@ -151,9 +151,9 @@ const InternalTable = props => {
   }, [rowKey]);
 
   // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
-  const triggerChangeColumns = newColumns => {
+  const triggerChangeColumns = (newColumns, type) => {
     setColumns(newColumns);
-    if (tableRef.current) {
+    if (tableRef.current && type === 'columnChoose') {
       tableRef.current.scrollTo({
         left: 0.1,
         behavior: "smooth"

package/lib/grid-component/hooks/utils.d.ts

@@ -68,3 +68,4 @@ export declare const removeColumns: <RecordType>(columns: ColumnsTable<RecordTyp
 export declare const convertFlatColumn: (array: ColumnsTable) => ColumnsTable[];
 export declare const convertColumns: <RecordType>(cols: ColumnsTable<RecordType>) => ColumnsTable<RecordType>;
 export declare const checkChild: (inputArray: any[]) => boolean;
+export declare const isEditable: <RecordType>(column: ColumnEditType, rowData: RecordType) => boolean | ((rowData: any) => boolean);

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

@@ -10,7 +10,7 @@ exports.customWeekStartEndFormat = exports.countItemsBeforeIndex = exports.conve
 exports.findAllChildrenKeys = findAllChildrenKeys;
 exports.getFirstSelectCell = exports.getEditType = exports.getDefaultValue = exports.getDatepickerFormat = exports.getDateString = exports.getColumnsVisible = exports.getAllVisibleKeys = exports.genPresets = exports.flattenData = exports.flattenArray = exports.findItemByKey = void 0;
 exports.getHiddenParentKeys = getHiddenParentKeys;
-exports.updateData = exports.updateColumnsByGroup = exports.updateColumns = exports.updateArrayByKey = exports.transformColumns1 = exports.transformColumns = exports.totalFixedWidth = exports.sumDataByField = exports.removeColumns = exports.parseBooleanToValue = exports.newGuid = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = exports.getRowsPasteIndex = exports.getRowNumber = exports.getLastSelectCell = void 0;
+exports.updateData = exports.updateColumnsByGroup = exports.updateColumns = exports.updateArrayByKey = exports.transformColumns1 = exports.transformColumns = exports.totalFixedWidth = exports.sumDataByField = exports.removeColumns = exports.parseBooleanToValue = exports.newGuid = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isEditable = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = exports.getRowsPasteIndex = exports.getRowNumber = exports.getLastSelectCell = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _moment = _interopRequireDefault(require("moment/moment"));
 var _uuid = require("uuid");
@@ -832,4 +832,11 @@ exports.convertColumns = convertColumns;
 const checkChild = inputArray => {
   return inputArray.some(item => item.children && item.children.length > 0);
 };
-exports.checkChild = checkChild;
+exports.checkChild = checkChild;
+const isEditable = (column, rowData) => {
+  if (column && typeof column.editEnable === 'function') {
+    return column.editEnable(rowData);
+  }
+  return column?.editEnable;
+};
+exports.isEditable = isEditable;

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

@@ -56,6 +56,7 @@ const GridEdit = props => {
     defaultValue,
     expandable,
     onCellClick,
+    rowEditable,
     ...rest
   } = props;
   const {
@@ -1372,7 +1373,8 @@ const GridEdit = props => {
           title: (0, _columns.getValueCell)(column, record[column.field], format),
           'data-col-index': colIndex,
           'data-row-index': rowNumber,
-          editing: isEditing(record),
+          editing: isEditing(record) && rowEditable?.(record) !== false && (0, _hooks.isEditable)(column, record) !== false,
+          // editing: isEditing(record) && rowEditable?.(record) !== false,
           tabIndex: (rowIndex ?? 0) * columns.length + colIndex,
           style: isPasteDragging ? {
             cursor: "crosshair"
@@ -1391,7 +1393,7 @@ const GridEdit = props => {
           onMouseUp: handleMouseUp
         }, /*#__PURE__*/_react.default.createElement("div", {
           className: 'ui-rc_content'
-        }, (0, _columns.renderContent)(column, value, record, rowIndex, format)), selectedCells && selectedCells.size > 0 && (0, _hooks.getLastSelectCell)(selectedCells).row === rowNumber && (0, _hooks.getLastSelectCell)(selectedCells).col === colIndex && !isSelectDragging &&
+        }, (0, _columns.renderContent)(column, value, record, rowIndex, format)), selectedCells && selectedCells.size > 0 && (0, _hooks.getLastSelectCell)(selectedCells).row === rowNumber && (0, _hooks.getLastSelectCell)(selectedCells).col === colIndex && (0, _hooks.isEditable)(column, record) !== false && !isSelectDragging &&
         /*#__PURE__*/
         // showDraggingPoint &&
         _react.default.createElement("div", {

package/lib/grid-component/type.d.ts

@@ -46,7 +46,7 @@ export type ColumnSelectTable = {
 };
 export type IEditSelectSettings = {
     fieldKey?: string;
-    options: any[];
+    options: any[] | ((rowData: any, field: string) => any[]);
     /**  get value form other field **/
     fieldValue?: string;
     /** get label form other field **/
@@ -114,6 +114,7 @@ export type ColumnType<RecordType> = Omit<RcColumnType<RecordType>, 'headerTempl
 export type ColumnEditType<RecordType = AnyObject> = Omit<ColumnType<RecordType>, 'children'> & {
     editType?: EditType | ((rowData?: RecordType) => EditType);
     disable?: boolean | ((rowData: any) => boolean);
+    editEnable?: boolean | ((rowData: any) => boolean);
     isClearable?: boolean;
     maxDate?: any;
     minDate?: any;
@@ -185,6 +186,7 @@ export interface TableEditProps<RecordType = AnyObject> extends Omit<TableProps<
     onCellPaste?: ICellPasteModel<RecordType>;
     onCellChange?: (args: CellChangeArgs<RecordType>, handleCallback: (rowData: any, index: any, value?: any) => void) => void;
     onCellClick?: (args: ICellClick, callback?: any) => void;
+    rowEditable?: (rowData: RecordType) => boolean;
 }
 export type ICellClick = {
     index: number;

package/package.json

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