Add _setLoadedRowsHandler in Table for call onChange after load data, Add dispatch onRowClick

Author: iron-tech-space

lib/components/Base/index.js

@@ -15,7 +15,7 @@ import moment from "moment";
 import { getISO, toFormat } from "../utils/datesUtils";
 import { withStore } from "./withStore";
 import { rtPrefix } from "../utils/variables";
-import { renderFormItemComponent, renderClassicWithLabel } from "../declarative";
+import { renderClassic, renderClassicWithLabel } from "../declarative";
 
 /** Компонент выбора даты */
 var DatePicker = function DatePicker(props) {
@@ -77,7 +77,7 @@ var Custom = function Custom(props) {
         // console.log('childNode = props.render')
         childNode = props.render;
         childProps = _extends({}, props, { componentType: 'Custom' });
-        return renderFormItemComponent(childNode)(childProps);
+        return renderClassic(childNode)(childProps);
     } else if (React.isValidElement(children)) {
         // console.log('childNode = children')
         childProps = _extends({}, children.props, props, { componentType: 'Custom' });

lib/components/Table/Table.js

@@ -12,8 +12,7 @@ import React, { useRef, forwardRef, useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-import BaseTable, { AutoResizer, callOrReturn } from 'react-base-table';
-// import BaseTable from "./BaseTable/BaseTable";
+import BaseTable, { AutoResizer } from 'react-base-table';
 import { empty, overlay } from './defaultSettings';
 import SelectionHead from './Selectable/SelectionHead';
 import SelectionCell, { parentAnalysis, onChangeSelectionCell } from './Selectable/SelectionCell';
@@ -181,7 +180,6 @@ var Table = forwardRef(function (props, ref) {
 
 	var selectedDispatchPath = dispatchPath && dispatchPath + '.selected';
 	var rowsDispatchPath = dispatchPath && dispatchPath + '.rows';
-	var rowDoubleClickDispatchPath = dispatchPath && dispatchPath + '.events.onRowDoubleClick';
 
 	useEffect(function () {
 		// console.log("Инициализация дефолтных значений ", selectColumn, columns);
@@ -302,6 +300,10 @@ var Table = forwardRef(function (props, ref) {
 		// }, 2000)
 	};
 
+	var _setLoadedRowsHandler = function _setLoadedRowsHandler(rows) {
+		_setRowsHandler(rows);
+		onChange && onChange(rows);
+	};
 	var _setRowsHandler = function _setRowsHandler(rows) {
 		// console.log('_setRowsHandler onChange');
 		_setRows(rows);
@@ -333,21 +335,14 @@ var Table = forwardRef(function (props, ref) {
 		selectedDispatchPath && props.setDateStore && props.setDateStore(selectedDispatchPath, data);
 	};
 
-	var rowDoubleClickDispatch = function rowDoubleClickDispatch(value) {
-		rowDoubleClickDispatchPath && props.setDateStore && props.setDateStore(rowDoubleClickDispatchPath, {
-			timestamp: moment(),
-			value: value
-		});
-	};
-
 	var onTableEventsDispatch = function onTableEventsDispatch(nameEvent, value) {
 		var dp = dispatchPath && dispatchPath + '.events.' + nameEvent;
 		dp && props.setDateStore && props.setDateStore(dp, {
 			timestamp: moment(),
 			value: value
 		});
 		// console.log('onTableEventsDispatch onChange');
-		onChange && onChange(value);
+		Array.isArray(value) && onChange && onChange(value);
 	};
 
 	var setFilterHandler = function setFilterHandler(filter) {
@@ -433,7 +428,7 @@ var Table = forwardRef(function (props, ref) {
 								child.children = [_defineProperty({}, rowKey, generateUUID())];
 							});
 							// _setRows(result);
-							_setRowsHandler(result);
+							_setLoadedRowsHandler(result);
 						} else {
 							var newRows = [].concat(_toConsumableArray(_rows));
 							// (data, rowKey, rowValue)
@@ -444,16 +439,16 @@ var Table = forwardRef(function (props, ref) {
 							node.children = result;
 							// console.log('newRows -> ', newRows);
 							// _setRows(newRows);
-							_setRowsHandler(newRows);
+							_setLoadedRowsHandler(newRows);
 						}
 					} else {
 						if (result && result.length < pageSize) {
 							setHasMore(false);
 						} else {
 							setHasMore(true);
 						}
-						pageNum === 0 ? _setRowsHandler(result) // _setRows
-						: _setRowsHandler(_rows.concat(result)); // _setRows
+						pageNum === 0 ? _setLoadedRowsHandler(result) // _setRows
+						: _setLoadedRowsHandler(_rows.concat(result)); // _setRows
 
 						// console.log('expandDefaultAll ', expandDefaultAll, _expandedRowKeys);
 						if (expandDefaultAll) setExpandedRowKeys(flatten(getTableRowKeys(result, rowKey)));
@@ -462,7 +457,7 @@ var Table = forwardRef(function (props, ref) {
 					setLoading(false);
 				}).catch(function (error) {
 					notificationError(error, 'Ошибка загрузки данных');
-					_setRowsHandler(_rows); // _setRows
+					_setLoadedRowsHandler(_rows); // _setRows
 					// setHasMore(false);
 					setLoading(false);
 				});
@@ -526,6 +521,7 @@ var Table = forwardRef(function (props, ref) {
 		    rowKey = _ref5.rowKey;
 
 		// console.log('actionSimpleClick')
+		onTableEventsDispatch('onRowClick', rowData);
 		_rowSelectAfterClick({ rowData: rowData, rowIndex: rowIndex, rowKey: rowKey, onClick: onRowClick });
 	};
 	var _onRowDoubleClick = function _onRowDoubleClick(_ref6) {
@@ -535,7 +531,8 @@ var Table = forwardRef(function (props, ref) {
 
 		// console.log('onDoubleClick', rowData, rowIndex, rowKey);
 		// console.log('actionDoubleClick')
-		rowDoubleClickDispatch(rowData);
+		// rowDoubleClickDispatch(rowData);
+		onTableEventsDispatch('onRowDoubleClick', rowData);
 		_rowSelectAfterClick({ rowData: rowData, rowIndex: rowIndex, rowKey: rowKey, onClick: onRowDoubleClick });
 	};
 

lib/components/declarative.js

@@ -109,7 +109,7 @@ export var renderDeclarative = function renderDeclarative(Component) {
     };
 };
 
-export var renderFormItemComponent = function renderFormItemComponent(Component) {
+var renderFormItemComponent = function renderFormItemComponent(Component) {
     return function (props) {
         var componentProps = getObjectExcludedProps(props, ['itemProps']);
         return renderDeclarative(_Form.Item)(_extends({}, props.itemProps, { noStyle: !(props.itemProps && props.itemProps.label) }))(renderClassic(Component)(componentProps));