directual-web-components-v2 3.11.335 → 3.11.337

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,15 +20068,21 @@ 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)) {
+      if (!_$1__default.isEqual(newModel, originalModelRef.current)) {
         submitDebouncedRef.current.cancel();
-        console.log('[SOCKET MODEL LOG] === МОДЕЛЬ ОБНОВЛЕНА СОКЕТОМ ===');
-        console.log('[SOCKET MODEL LOG] Старая модель:', JSON.parse(JSON.stringify(model)));
-        console.log('[SOCKET MODEL LOG] Новая модель:', JSON.parse(JSON.stringify(newModel)));
+        const userChangedFields = Object.keys(model).filter(key => !_$1__default.isEqual(model[key], originalModelRef.current[key]));
+        const mergedModel = _extends({}, newModel);
+        userChangedFields.forEach(key => {
+          mergedModel[key] = model[key];
+        });
+        console.log('[SOCKET MODEL LOG] === СОКЕТ: ОБНОВЛЕНИЕ МОДЕЛИ ===');
+        console.log('[SOCKET MODEL LOG] Серверная модель:', JSON.parse(JSON.stringify(newModel)));
+        console.log('[SOCKET MODEL LOG] Изменённые пользователем поля (сохранены):', userChangedFields);
+        console.log('[SOCKET MODEL LOG] Итоговая модель:', JSON.parse(JSON.stringify(mergedModel)));
         isSocketUpdateRef.current = true;
-        setModel(newModel);
+        setModel(mergedModel);
         setOriginalModel(newModel);
       }
       setOriginalExtendedModel(newExtendedModel);
@@ -20448,6 +20467,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 +20531,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 +21099,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 +21172,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 +21217,10 @@ function RenderStep(props) {
     editModelAL,
     originalModel,
     model,
+    modelRef,
+    extendedModelRef,
+    stateRef,
+    edditingOn,
     checkHidden,
     userDebug,
     dict,
@@ -21217,21 +21251,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;
@@ -26650,6 +26703,8 @@ function Comments(props) {
     handleRoute
   } = props;
   const lang = locale ? locale.length == 3 ? locale : 'ENG' : 'ENG';
+  const buttonTexts = _$1__default.get(data, "params.buttonTexts") || {};
+  const t = (key, fallback) => buttonTexts[key] || fallback;
   const [comments, setComments] = React.useState(_$1__default.get(data, "data") || []);
   const [loading, setLoading] = React.useState(false);
   const [error, setError] = React.useState('');
@@ -26702,9 +26757,10 @@ function Comments(props) {
   return /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.comments + " FPS_COMMENTS"
   }, /*#__PURE__*/React__default.createElement(CommentsHeader, _extends({
-    header: dict[lang].comments.comments,
+    header: t('headerText', dict[lang].comments.comments),
     counter: (comments || []).length
   }, props)), allowSend && /*#__PURE__*/React__default.createElement(AddComment, _extends({}, props, {
+    t: t,
     lang: lang,
     loading: loading,
     sendComment: sendComment,
@@ -26716,6 +26772,7 @@ function Comments(props) {
   }, error), /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentsList
   }, comments.filter(comment => !_$1__default.get(comment, _$1__default.get(data, "params._replyField")) || _$1__default.get(comment, _$1__default.get(data, "params._replyField")) == 'root').map(comment => /*#__PURE__*/React__default.createElement(Comment, _extends({}, props, {
+    t: t,
     sendComment: sendComment,
     updateCommentText: updateCommentText,
     lang: lang,
@@ -26739,7 +26796,8 @@ function Comment(props) {
     allowSend,
     allowEdit,
     sendComment,
-    updateCommentText
+    updateCommentText,
+    t
   } = props;
   const [addReply, setAddReply] = React.useState(false);
   const [isEditing, setIsEditing] = React.useState(false);
@@ -26819,13 +26877,13 @@ function Comment(props) {
     className: styles$N.commentWrapperAssignTo + " " + (isResoled ? styles$N.taskResolved : "") + "  FPS_COMMENT_WRAPPER__ASSIGN"
   }, isAssignedToMe ? /*#__PURE__*/React__default.createElement("span", null, dict[lang].comments.assignedToMe) : /*#__PURE__*/React__default.createElement("span", null, dict[lang].comments.assignedTo, " ", /*#__PURE__*/React__default.createElement("b", null, assigneName)), isResoled ? /*#__PURE__*/React__default.createElement("span", {
     className: "icon icon-done"
-  }, dict[lang].comments.taskResolved, " ", formatDate(resolvedDate, formatResolvedDate)) : isAssignedToMe ? /*#__PURE__*/React__default.createElement(Button, {
+  }, t('taskResolvedText', dict[lang].comments.taskResolved), " ", formatDate(resolvedDate, formatResolvedDate)) : isAssignedToMe ? /*#__PURE__*/React__default.createElement(Button, {
     loading: localLoading,
     onClick: resolveTask,
     small: true,
     height: 32,
     icon: "done"
-  }, dict[lang].comments.resolveTask) : ''), /*#__PURE__*/React__default.createElement("div", {
+  }, t('resolveTaskText', dict[lang].comments.resolveTask)) : ''), /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentBody
   }, parent && /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentParent + " icon icon-arrowRight small"
@@ -26863,11 +26921,11 @@ function Comment(props) {
     height: 32,
     accent: true,
     disabled: !editText
-  }, dict[lang].comments.save), /*#__PURE__*/React__default.createElement(Button, {
+  }, t('saveText', dict[lang].comments.save)), /*#__PURE__*/React__default.createElement(Button, {
     onClick: cancelEdit,
     small: true,
     height: 32
-  }, dict[lang].comments.cancel))) : /*#__PURE__*/React__default.createElement("div", {
+  }, t('cancelText', dict[lang].comments.cancel)))) : /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentBodyText
   }, commentText), commentAttachment && commentAttachment.length > 0 && commentAttachment.map(file => {
     const fileName = file.split("/")[file.split("/").length - 1];
@@ -26883,10 +26941,10 @@ function Comment(props) {
   }, _$1__default.includes(data.writeFields, _$1__default.get(data, "params._replyField")) && allowSend && /*#__PURE__*/React__default.createElement("div", {
     onClick: e => setAddReply(true),
     className: "icon icon-bubble small " + styles$N.commentReplyButton
-  }, dict[lang].comments.reply), allowEdit && isAuthor && /*#__PURE__*/React__default.createElement("div", {
+  }, t('replyText', dict[lang].comments.reply)), allowEdit && isAuthor && /*#__PURE__*/React__default.createElement("div", {
     onClick: e => setIsEditing(true),
     className: "icon icon-edit small " + styles$N.commentReplyButton
-  }, dict[lang].comments.edit)))), addReply && /*#__PURE__*/React__default.createElement("div", {
+  }, t('editText', dict[lang].comments.edit))))), addReply && /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.childComments
   }, /*#__PURE__*/React__default.createElement(AddComment, _extends({}, props, {
     parentID: commentID,
@@ -26924,7 +26982,8 @@ function AddComment(props) {
     sendComment,
     parentID,
     data,
-    loading
+    loading,
+    t
   } = props;
   const rolesExample = [{
     key: 'admin',
@@ -26966,7 +27025,7 @@ function AddComment(props) {
       bottom: 0
     },
     ok: true
-  }, dict[lang].comments.submitted);
+  }, t('submittedText', dict[lang].comments.submitted));
   return /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentsAdd
   }, /*#__PURE__*/React__default.createElement(Input, {
@@ -26975,7 +27034,7 @@ function AddComment(props) {
     defaultValue: comment[_$1__default.get(data, "params._textField")],
     onChange: setCommentField(_$1__default.get(data, "params._textField")),
     rows: "auto",
-    placeholder: dict[lang].comments.write
+    placeholder: t('placeholderText', dict[lang].comments.write)
   }), /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentsAdditionslControls
   }, addFile && allowAttachment && /*#__PURE__*/React__default.createElement(FileUpload, {
@@ -27057,9 +27116,9 @@ function AddComment(props) {
     accent: true,
     icon: "bubble",
     onClick: () => sendComment(comment, finish)
-  }, dict[lang].comments.send), onCancel && /*#__PURE__*/React__default.createElement(Button, {
+  }, t('sendText', dict[lang].comments.send)), onCancel && /*#__PURE__*/React__default.createElement(Button, {
     onClick: onCancel
-  }, dict[lang].comments.cancel)));
+  }, t('cancelText', dict[lang].comments.cancel))));
 }
 Comments.propTypes = {
   data: propTypes.object,