directual-web-components-v2 3.11.336 → 3.11.337

package/dist/index.js

@@ -20070,13 +20070,19 @@ function FpsForm2(props) {
       setExtendedModel(newExtendedModel);
       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);
@@ -26697,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('');
@@ -26749,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,
@@ -26763,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,
@@ -26786,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);
@@ -26866,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"
@@ -26910,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];
@@ -26930,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,
@@ -26971,7 +26982,8 @@ function AddComment(props) {
     sendComment,
     parentID,
     data,
-    loading
+    loading,
+    t
   } = props;
   const rolesExample = [{
     key: 'admin',
@@ -27013,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, {
@@ -27022,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, {
@@ -27104,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,