directual-web-components-v2 3.11.335 → 3.11.336

package/dist/index.js

@@ -19497,6 +19497,11 @@ function ElementAction(props) {
       if (action.actionSubmit) {
         console.log("onSubmit");
         onSubmit(res => {
+          if (res === false) {
+            setLoading(false);
+            finish && finish(false);
+            return;
+          }
           console.log("finish onSubmit", res);
           console.log("payload => " + action.endpoint);
           console.log(payload);
@@ -19669,6 +19674,11 @@ function ElementText(props) {
       if (action.actionSubmit) {
         console.log("onSubmit");
         onSubmit(res => {
+          if (res === false) {
+            setLoading(false);
+            finish && finish(false);
+            return;
+          }
           console.log("finish onSubmit", res);
           console.log("payload => " + action.endpoint);
           console.log(payload);
@@ -19961,6 +19971,7 @@ function FpsForm2(props) {
   const isSocketUpdateRef = React.useRef(false);
   const restoredStepRef = React.useRef(null);
   const isAutoSubmittingRef = React.useRef(false);
+  const initialObjectIdRef = React.useRef(edditingOn ? _$1__default.get(data, "data[0].id") : null);
   function usePrevious(value) {
     const ref = React.useRef();
     React.useEffect(() => {
@@ -20025,7 +20036,9 @@ function FpsForm2(props) {
     return newModel;
   }
   React.useEffect(() => {
-    if (_$1__default.get(model, "id") && _$1__default.get(data, "data[0].id") && _$1__default.get(model, "id") !== _$1__default.get(data, "data[0].id")) {
+    const _incomingId = _$1__default.get(data, "data[0].id");
+    if (initialObjectIdRef.current && _incomingId && initialObjectIdRef.current !== _incomingId) {
+      console.warn('[SOCKET GUARD] Отклонён апдейт для чужого объекта:', _incomingId, '(наш:', initialObjectIdRef.current + ')');
       return;
     }
     const timestampToISO = timestamp => {
@@ -20055,7 +20068,7 @@ function FpsForm2(props) {
       }, {});
       const newExtendedModel = _extends({}, gatherDefaults(), _$1__default.get(data, "data[0]"), convertedDates, convertedBools);
       setExtendedModel(newExtendedModel);
-      let saveSate = _extends({}, state);
+      let saveSate = _extends({}, stateRef.current);
       const newModel = _extends({}, flatternModel(_extends({}, gatherDefaults(), _$1__default.get(data, "data[0]"), convertedDates, convertedBools)));
       if (!_$1__default.isEqual(newModel, model)) {
         submitDebouncedRef.current.cancel();
@@ -20448,6 +20461,9 @@ function FpsForm2(props) {
     if (autoSubmit) {
       console.log('[AUTOSUBMIT LOG] Устанавливаем state перед отправкой:', JSON.parse(JSON.stringify(localState)));
     }
+    if (localModel.id && initialObjectIdRef.current && localModel.id !== initialObjectIdRef.current) {
+      console.error('[SUBMIT ID MISMATCH] id в модели:', localModel.id, '!= initialObjectId:', initialObjectIdRef.current, '— возможна подмена объекта!', JSON.parse(JSON.stringify(localModel)));
+    }
     setState(_extends({}, localState));
     setLoading(true);
     const endpoint = _$1__default.get(data, "sl");
@@ -20509,7 +20525,7 @@ function FpsForm2(props) {
           }, stateUpdate));
         }
         if (submitKeepModel && !resetModel) {
-          modelUpdate = _extends({}, model, modelToSend, modelUpdate);
+          modelUpdate = _extends({}, currentModel, modelToSend, modelUpdate);
         } else if (resetModel) {
           modelUpdate = {};
           extendedModelUpdate = {};
@@ -21077,6 +21093,10 @@ function FpsForm2(props) {
       currentStep: currentStep,
       refreshOptions: refreshOptions,
       model: model,
+      modelRef: modelRef,
+      extendedModelRef: extendedModelRef,
+      stateRef: stateRef,
+      edditingOn: edditingOn,
       checkHidden: checkHidden,
       dict: dict,
       extendedModel: extendedModel,
@@ -21146,6 +21166,10 @@ function FpsForm2(props) {
       refreshOptions: refreshOptions,
       currentStep: currentStep,
       model: model,
+      modelRef: modelRef,
+      extendedModelRef: extendedModelRef,
+      stateRef: stateRef,
+      edditingOn: edditingOn,
       userDebug: userDebug,
       setOriginalModel: setOriginalModel,
       originalExtendedModel: originalExtendedModel,
@@ -21187,6 +21211,10 @@ function RenderStep(props) {
     editModelAL,
     originalModel,
     model,
+    modelRef,
+    extendedModelRef,
+    stateRef,
+    edditingOn,
     checkHidden,
     userDebug,
     dict,
@@ -21217,21 +21245,40 @@ function RenderStep(props) {
         if (ignoreResponse) return;
         try {
           const response = JSON.parse(content);
+          const currentModel = modelRef && modelRef.current || model;
+          const currentExtendedModel = extendedModelRef && extendedModelRef.current || extendedModel;
+          const currentState = stateRef && stateRef.current || state;
           if (!_$1.isEmpty(_$1__default.get(response, "state"))) {
             const stateUpdate = _$1__default.get(response, "state");
-            setState(_extends({}, state, stateUpdate));
+            setState(_extends({}, currentState, stateUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "object"))) {
-            const modelUpdate = _$1__default.get(response, "object");
-            setModel(_extends({}, model, modelUpdate));
-            setOriginalModel(_extends({}, model, modelUpdate));
-            setOriginalExtendedModel(_extends({}, extendedModel, modelUpdate));
+            let modelUpdate = _$1__default.get(response, "object");
+            if (edditingOn && currentModel.id) {
+              if (modelUpdate.id && modelUpdate.id !== currentModel.id) {
+                console.warn('[callEndpointPOST] Отклонена попытка подмены id модели:', currentModel.id, '->', modelUpdate.id);
+              }
+              modelUpdate = _extends({}, modelUpdate, {
+                id: currentModel.id
+              });
+            }
+            setModel(_extends({}, currentModel, modelUpdate));
+            setOriginalModel(_extends({}, currentModel, modelUpdate));
+            setOriginalExtendedModel(_extends({}, currentExtendedModel, modelUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "model"))) {
-            const modelUpdate = _$1__default.get(response, "model");
-            setModel(_extends({}, model, modelUpdate));
-            setOriginalModel(_extends({}, model, modelUpdate));
-            setOriginalExtendedModel(_extends({}, extendedModel, modelUpdate));
+            let modelUpdate = _$1__default.get(response, "model");
+            if (edditingOn && currentModel.id) {
+              if (modelUpdate.id && modelUpdate.id !== currentModel.id) {
+                console.warn('[callEndpointPOST] Отклонена попытка подмены id модели:', currentModel.id, '->', modelUpdate.id);
+              }
+              modelUpdate = _extends({}, modelUpdate, {
+                id: currentModel.id
+              });
+            }
+            setModel(_extends({}, currentModel, modelUpdate));
+            setOriginalModel(_extends({}, currentModel, modelUpdate));
+            setOriginalExtendedModel(_extends({}, currentExtendedModel, modelUpdate));
           }
           if (!_$1.isEmpty(_$1__default.get(response, "redirect")) && !_$1.isEmpty(_$1__default.get(response, "redirect.target"))) {
             let delay = 0;