Add withMount in subscribe

Author: iron-tech-space

dist/index.es.js

@@ -4,6 +4,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
+
 import React, { useState, useEffect } from 'react';
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
@@ -67,14 +69,17 @@ export var withStore = function withStore(Component, antFormItemProps) {
             valuePropName = withStoreProps.valuePropName;
 
 
-        var excludeProps = ['componentType', 'setDateStore', 'subscribe', 'dispatch', 'dispatchExtraData']; // ...subscribe.map(item => item.name),
+        var excludeProps = ['componentType', 'setDateStore', 'subscribe'].concat(_toConsumableArray(subscribe.map(function (item) {
+            return item.name;
+        })), ['dispatch', 'dispatchExtraData']); // ...subscribe.map(item => item.name),
 
         var isMounted = useMounted();
 
         /** Подписка на изменение props[subscribe.name] в сторе */
         subscribe.map(function (item) {
             return useEffect(function () {
-                if (isMounted && item.name) {
+                // console.log("withStore subscribe: ", item.name, item.withMount);
+                if ((item.withMount || isMounted) && item.name) {
                     // console.log("storeHOC => subscribe: ", props[subscribe.name]);
                     item.onChange && item.onChange({
                         value: props[item.name],

dist/index.es.js.map

@@ -9,16 +9,21 @@ var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = [
 
 import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
 import FormItems from "./FormItems";
 
-import { getObjectExcludedProps, noop, notificationError } from "../utils/baseUtils";
+import { dispatchToStore, getObjectExcludedProps, noop, notificationError } from "../utils/baseUtils";
 import { rtPrefix } from "../utils/variables";
+import { setDateStore } from "../../redux/rtd.actions";
 
 var excludeProps = ["componentType", "noPadding", "scrollable", "header", "body", "footer", "loadInitData", "autoSaveForm", "requestSaveForm", "methodSaveForm", "processBeforeSaveForm"];
 
 /** Компонент формы */
 var Form = function Form(props) {
-    var loadInitData = props.loadInitData,
+    var dispatch = props.dispatch,
+        setDateStore = props.setDateStore,
+        loadInitData = props.loadInitData,
         header = props.header,
         body = props.body,
         footer = props.footer,
@@ -102,7 +107,7 @@ var Form = function Form(props) {
                 _notification.success({
                     message: "Сохранение прошло успешно"
                 });
-                if (props.onFinish) props.onFinish(values);
+                props.onFinish && props.onFinish(values);
             }).catch(function (error) {
                 return notificationError(error, 'Ошибка при сохранении');
             });
@@ -141,7 +146,12 @@ var Form = function Form(props) {
                 style: _extends({}, antFormProps.style, { width: '100%', height: '100%' }),
                 initialValues: _extends({}, antFormProps.initialValues, initFormData),
                 onFinish: onFinish,
-                onFinishFailed: onFinishFailed
+                onFinishFailed: onFinishFailed,
+                onFieldsChange: function onFieldsChange(changedFields, allFields) {
+                    var values = antForm.getFieldsValue();
+                    // console.log('dispatchToStore => ', dispatch, values);
+                    dispatch && dispatchToStore({ dispatch: dispatch, setDateStore: setDateStore, value: values });
+                }
             }),
             React.createElement(
                 React.Fragment,
@@ -200,4 +210,8 @@ Form.defaultProps = {
     autoSaveForm: true
 };
 
-export default Form;
+var mapDispatchToProps = function mapDispatchToProps(dispatch) {
+    return bindActionCreators({ setDateStore: setDateStore }, dispatch);
+};
+
+export default connect(null, mapDispatchToProps)(Form);

dist/index.js

@@ -122,7 +122,9 @@ var Modal = function Modal(props) {
     /** Подписка на изменение props[subscribe.name] в сторе */
     subscribe.map(function (item) {
         return useEffect(function () {
-            if (isMounted && item.name) {
+            // if(!isMounted && !item.name)
+            //     return;
+            if ((item.withMount || isMounted) && item.name) {
                 // console.log("storeHOC => subscribe: ", props[subscribe.name]);
                 item.onChange && item.onChange({
                     value: props[item.name],

dist/index.js.map

@@ -196,7 +196,7 @@ var Table = function Table(props) {
   /** Подписка на изменение props[subscribe.name] в сторе */
   subscribe.map(function (item) {
     return useEffect(function () {
-      if (isMounted && item.name) {
+      if ((item.withMount || isMounted) && item.name) {
         // console.log("Table => useEffect => ", props); //item.name, props[item.name]
         var extraData = {};
         if (item.extraData) {

lib/components/Base/withStore.js

@@ -271,7 +271,7 @@ var Table = forwardRef(function (props, ref) {
 	/** Подписка на изменение props[subscribe.name] в сторе */
 	subscribe.map(function (item) {
 		return useEffect(function () {
-			if (isMounted && item.name) {
+			if ((item.withMount || isMounted) && item.name) {
 				// console.log("Table => useEffect => [%s] ", item.name, props[item.name]);
 				var extraData = {};
 				if (item.extraData) {

lib/components/Form/Form.js

@@ -114,7 +114,7 @@ export var dispatchToStore = function dispatchToStore(_ref) {
 	    extraData = _ref.extraData;
 
 	if (dispatch.path) {
-		// console.log("storeHOC => dispatchToStore");
+		// console.log("storeHOC => dispatchToStore", dispatch, setDateStore);
 		if (dispatch.type === 'event') setDateStore && setDateStore(dispatch.path, {
 			timestamp: moment(),
 			// type: dispatch.type,