Merge pull request #4 from iron-tech-space/editable_table

iron-tech-space · web-flow · commit 950dcb7bb62f · 2021-07-23T16:17:56.000+03:00
Fix bugs with Form, Table, Modal, Select
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
+## 0.0.72
+
+- Add initFormData in Form dispatch
+- Add className and style in Rt Table
+- Move Modal dispatch in request
+- Fix radical id in Select
+
 ## 0.0.71
 
-- Fix select lose param 
+- Fix select lose param
 - Fix modal requestSaveForm
 
 ## 0.0.70
diff --git a/dist/index.es.js b/dist/index.es.js
diff --git a/dist/index.es.js.map b/dist/index.es.js.map
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/lib/components/Modal/Modal.js b/lib/components/Modal/Modal.js
@@ -132,9 +132,9 @@ var Modal = function Modal(props) {
 
         dispatchToStore({ dispatch: dispatch, setDateStore: props.setDateStore, value: saveObj });
 
-        if (modalProps.requestSaveRow && modalProps.methodSaveForm) {
+        if (modalProps.requestSaveForm && modalProps.methodSaveForm) {
             // console.log("Modal Events => type: ", type, method, row, _modalData);
-            modalProps.requestSaveRow({
+            modalProps.requestSaveForm({
                 method: modalProps.methodSaveForm,
                 data: saveObj
             }).then(function (response) {
diff --git a/lib/components/Select/Select.js b/lib/components/Select/Select.js
@@ -18,7 +18,7 @@ import { generateUUID, getObjectExcludedProps, notificationError, useMounted } f
 
 import { CheckOutlined } from '@ant-design/icons';
 
-var excludeProps = ['componentType', 'defaultSortBy', 'defaultFilter', 'defaultSearchValue', 'sortBy', 'filter', 'searchValue', 'searchParamName', 'infinityMode', 'requestLoadRows', 'optionConverter', 'options', 'widthControl', 'pageSize'];
+var excludeProps = ['componentType', 'defaultSortBy', 'defaultFilter', 'defaultSearchValue', 'sortBy', 'filter', 'searchValue', 'searchParamName', 'lostParamName', 'infinityMode', 'requestLoadRows', 'optionConverter', 'options', 'widthControl', 'pageSize'];
 
 /** Компонент выбора элемента(ов) из списка */
 var Select = function Select(props) {
@@ -61,7 +61,7 @@ var Select = function Select(props) {
 	    _options = _useState6[0],
 	    _setOptions = _useState6[1];
 
-	var _useState7 = useState({}),
+	var _useState7 = useState(undefined),
 	    _useState8 = _slicedToArray(_useState7, 2),
 	    tmpOption = _useState8[0],
 	    setTmpOption = _useState8[1];
@@ -149,13 +149,13 @@ var Select = function Select(props) {
 			}, 0) === options.length) _setIsSelectAll(true);else _setIsSelectAll(false);
 			onChange(value);
 		} else {
-			if (options && options.findIndex(function (option) {
+			if (value && options && options.findIndex(function (option) {
 				return option.value === value;
 			}) === -1) {
-				// console.log('Load tmpOption');
+				console.log('Load tmpOption');
 				_loadTmpOption();
 			} else {
-				// console.log('Clear tmpOption');
+				console.log('Clear tmpOption');
 				setTmpOption(undefined);
 			}
 		}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rt-design",
-	"version": "0.0.71",
+	"version": "0.0.72",
 	"description": "React technical design library",
 	"author": "Iron tech space",
 	"license": "MIT",
diff --git a/src/components/Form/Form.js b/src/components/Form/Form.js
@@ -123,7 +123,10 @@ const Form = (props) => {
                     onFinish={onFinish}
                     onFinishFailed={onFinishFailed}
                     onFieldsChange={(changedFields, allFields) => {
-                        const values = antForm.getFieldsValue();
+                        const values = {
+                            ...initFormData,
+                            ...antForm.getFieldsValue(),
+                        };
                         // console.log('dispatchToStore => ', dispatch, values);
                         dispatch && dispatchToStore({ dispatch, setDateStore, value: values })}
                     }
diff --git a/src/components/Modal/Modal.js b/src/components/Modal/Modal.js
@@ -96,8 +96,6 @@ const Modal = props => {
         // console.log("Modal Events => before dispatchToStore: ", dispatch);
         const saveObj = {..._modalData, ...values};
 
-        dispatchToStore({dispatch, setDateStore: props.setDateStore, value: saveObj});
-
         if (modalProps.requestSaveForm && modalProps.methodSaveForm) {
             // console.log("Modal Events => type: ", type, method, row, _modalData);
             modalProps.requestSaveForm({
@@ -110,16 +108,16 @@ const Modal = props => {
                     });
                     modalProps.onOk && modalProps.onOk(saveObj, response.data);
                     modalProps.onFinish && modalProps.onFinish(saveObj, response.data);
+                    dispatchToStore({dispatch, setDateStore: props.setDateStore, value: saveObj});
                     _onCloseModal();
                 })
                 .catch(error => notificationError(error, 'Ошибка при сохранении'));
         } else {
             modalProps.onOk && modalProps.onOk(saveObj);
             modalProps.onFinish && modalProps.onFinish(saveObj);
+            dispatchToStore({dispatch, setDateStore: props.setDateStore, value: saveObj});
             _onCloseModal();
         }
-
-
     };
 
     const onFinishFailedHandler = (errorInfo) => {
diff --git a/src/components/Select/Select.js b/src/components/Select/Select.js
@@ -59,7 +59,7 @@ const Select = props => {
 	const [_loading, _setLoading] = useState(false);
 	/** Опции селекта */
 	const [_options, _setOptions] = useState(options);
-	const [tmpOption, setTmpOption] = useState({});
+	const [tmpOption, setTmpOption] = useState(undefined);
 
 	/** Индикатор достижения низа окна */
 	const [isEndReached, setIsEndReached] = useState(false);
diff --git a/src/components/Table/AntTable/Table.js b/src/components/Table/AntTable/Table.js
@@ -950,6 +950,10 @@ Table.propTypes = {
   /** Отобрадать ли разделители строк */
   rowBordered: PropTypes.bool,
 
+  className: PropTypes.string,
+
+  style: PropTypes.object,
+
   /**
    * LOAD DATA PROPS
    * */
diff --git a/src/components/Table/ReactBaseTable/Table.js b/src/components/Table/ReactBaseTable/Table.js
@@ -103,6 +103,8 @@ const Table = forwardRef((props, ref) => {
 		estimatedRowHeight,
 		// cellBordered, // need Props.types
 		rowBordered,  // need Props.types
+		className,
+		style,
 
 		/** Load Data Props */
 		loadThreshold,
@@ -988,7 +990,7 @@ const Table = forwardRef((props, ref) => {
 	};
 
 	return (
-		<div className={`${rtPrefix}-table`}>
+		<div className={`${rtPrefix}-table ${className}`} style={style}>
 			<div className={`${rtPrefix}-baseTable`}>
 				<AutoResizer>
 					{({width, height}) => (
@@ -1224,6 +1226,10 @@ Table.propTypes = {
 	/** Отобрадать ли разделители строк */
 	rowBordered: PropTypes.bool,
 
+	className: PropTypes.string,
+
+	style: PropTypes.object,
+
 	/**
 	 * LOAD DATA PROPS
 	 * */
@@ -1355,6 +1361,8 @@ Table.defaultProps = {
 	estimatedRowHeight: undefined,
 	cellBordered: false,
 	rowBordered: true,
+	className: "",
+	style: {},
 
 	loadThreshold: 300,
 	pageSize: 50,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "rt-design",`
`3`		`- "version": "0.0.71",`
	`3`	`+ "version": "0.0.72",`
`4`	`4`	`"description": "React technical design library",`
`5`	`5`	`"author": "Iron tech space",`
`6`	`6`	`"license": "MIT",`