directual-web-components-v2 3.11.322 → 3.11.324

package/dist/index.css

@@ -8410,6 +8410,7 @@ div._x81-m._xmAnF h2 {
 ._3g99w ._2QfjE ._rwMv- ._1RsJD {
   font-size: var(--text-small-size);
   opacity: 0.5;
+  margin-right: 10px;
   transition: 0.5s;
   cursor: pointer;
 }

package/dist/index.js

@@ -1829,7 +1829,9 @@ const dict = {
       assignedToMe: "Assigned to me",
       assignedTo: "Assigned to",
       taskResolved: "Task is resolved",
-      resolveTask: "Resolve task"
+      resolveTask: "Resolve task",
+      edit: "Edit",
+      save: "Save"
     },
     sortField: 'Sort field',
     error: 'Error',
@@ -2322,7 +2324,9 @@ const dict = {
       assignedToMe: "Назначено на меня",
       assignedTo: "Назначено на",
       taskResolved: "Задача закрыта",
-      resolveTask: "Закрыть задачу"
+      resolveTask: "Закрыть задачу",
+      edit: "Редактировать",
+      save: "Сохранить"
     },
     success: 'Успех',
     "auth": {
@@ -19939,31 +19943,23 @@ function FpsForm2(props) {
       const newModel = _extends({}, flatternModel(_extends({}, gatherDefaults(), _$1__default.get(data, "data[0]"), convertedDates, convertedBools)));
       if (!_$1__default.isEqual(newModel, model)) {
         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)));
         isSocketUpdateRef.current = true;
         setModel(newModel);
         setOriginalModel(newModel);
       }
       setOriginalExtendedModel(newExtendedModel);
-      console.log('[SOCKET/RESTORE LOG] === НАЧАЛО СОКЕТНОГО ОБНОВЛЕНИЯ ===');
-      console.log('[SOCKET/RESTORE LOG] текущий state ДО перезаписи:', JSON.parse(JSON.stringify(state)));
-      console.log('[SOCKET/RESTORE LOG] saveSate перед templateState:', JSON.parse(JSON.stringify(saveSate)));
       const templatedState = templateState(_$1__default.get(data, "params.state"), newModel);
-      console.log('[SOCKET/RESTORE LOG] params.state:', _$1__default.get(data, "params.state"));
-      console.log('[SOCKET/RESTORE LOG] templateState вернул:', JSON.parse(JSON.stringify(templatedState)));
       saveSate = _extends({}, saveSate, templatedState);
-      console.log('[SOCKET/RESTORE LOG] saveSate после templateState:', JSON.parse(JSON.stringify(saveSate)));
       if (_$1__default.get(params, "general.restoreState") && _$1__default.get(params, "general.saveStateTo")) {
         const fieldName = _$1__default.get(params, "general.saveStateTo");
         const fieldValue = newModel[fieldName];
-        console.log('[SOCKET/RESTORE LOG] Восстанавливаем state из поля:', fieldName);
-        console.log('[SOCKET/RESTORE LOG] Значение поля:', fieldValue);
         const restoredState = parseJson(fieldValue);
-        console.log('[SOCKET/RESTORE LOG] restoredState (распарсенный):', JSON.parse(JSON.stringify(restoredState)));
         saveSate = _extends({}, saveSate, restoredState);
         restoredStepRef.current = restoredState.step;
       }
-      console.log('[SOCKET/RESTORE LOG] ИТОГОВЫЙ setState с:', JSON.parse(JSON.stringify(saveSate)));
-      console.log('[SOCKET/RESTORE LOG] === КОНЕЦ СОКЕТНОГО ОБНОВЛЕНИЯ ===');
       setState(saveSate);
       setInitialized(true);
     }
@@ -20213,14 +20209,10 @@ function FpsForm2(props) {
       submitMapping = [];
     }
     if (autoSubmit && isAutoSubmittingRef.current) {
-      console.log('[AUTOSUBMIT LOG] Заблокирован параллельный автосабмит');
       finish && finish(false);
       return;
     }
     if (autoSubmit) {
-      console.log('[AUTOSUBMIT LOG] === НАЧАЛО АВТОСАБМИТА ===');
-      console.log('[AUTOSUBMIT LOG] state ДО сабмита:', JSON.parse(JSON.stringify(stateRef.current)));
-      console.log('[AUTOSUBMIT LOG] model:', JSON.parse(JSON.stringify(currentModel || modelRef.current)));
       isAutoSubmittingRef.current = true;
     }
     newExtendedModel = newExtendedModel || extendedModelRef.current;
@@ -26340,6 +26332,7 @@ function Comments(props) {
   }
   const allowAttachment = _$1__default.includes(data.writeFields, _$1__default.get(data, "params._fileField"));
   const allowSend = _$1__default.includes(data.writeFields, _$1__default.get(data, "params._textField"));
+  const allowEdit = _$1__default.get(data, "params.general.allowEdit");
   return /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.comments + " FPS_COMMENTS"
   }, /*#__PURE__*/React__default.createElement(CommentsHeader, _extends({
@@ -26360,6 +26353,7 @@ function Comments(props) {
     sendComment: sendComment,
     lang: lang,
     allowSend: allowSend,
+    allowEdit: allowEdit,
     loading: loading,
     allowAttachment: allowAttachment,
     comments: comments,
@@ -26376,9 +26370,16 @@ function Comment(props) {
     comments,
     parent,
     allowSend,
+    allowEdit,
     sendComment
   } = props;
   const [addReply, setAddReply] = React.useState(false);
+  const [isEditing, setIsEditing] = React.useState(false);
+  const [editText, setEditText] = React.useState("");
+  React.useEffect(() => {
+    const commentText = _$1__default.get(comment, _$1__default.get(data, "params._textField"));
+    setEditText(commentText || "");
+  }, [_$1__default.get(comment, _$1__default.get(data, "params._textField"))]);
   const formatDate = (value, formatOptions) => {
     if (!value) {
       return null;
@@ -26412,6 +26413,7 @@ function Comment(props) {
   }
   const isTask = !!_$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee"));
   const isAssignedToMe = (_$1__default.get(auth, "user") == _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee")) || _$1__default.get(auth, "user") == _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee") + ".id")) && _$1__default.get(auth, "isAuth");
+  const isAuthor = (_$1__default.get(auth, "user") == _$1__default.get(comment, _$1__default.get(data, "params._userField")) || _$1__default.get(auth, "user") == _$1__default.get(comment, _$1__default.get(data, "params._userField") + ".id")) && _$1__default.get(auth, "isAuth");
   const assigneName = isTask ? _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee") + ".firstName") ? _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee") + ".firstName") + ' ' + _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee") + ".lastName") : _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee") + ".id") || _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_assignee")) : '';
   const isResoled = isTask && _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_bool"));
   const resolvedDate = _$1__default.get(comment, _$1__default.get(data, "params.assignmentOn_dateClosed"));
@@ -26428,6 +26430,22 @@ function Comment(props) {
     _$1__default.get(data, "params.assignmentOn_dateClosed") && _$1__default.set(payload, _$1__default.get(data, "params.assignmentOn_dateClosed"), moment__default().toISOString());
     sendComment(payload, () => setLocalLoading(false), true);
   };
+  const saveEdit = () => {
+    if (!comment.id) return;
+    setLocalLoading(true);
+    let payload = {
+      id: comment.id
+    };
+    _$1__default.set(payload, _$1__default.get(data, "params._textField"), editText);
+    sendComment(payload, () => {
+      setLocalLoading(false);
+      setIsEditing(false);
+    }, true);
+  };
+  const cancelEdit = () => {
+    setEditText(commentText);
+    setIsEditing(false);
+  };
   return /*#__PURE__*/React__default.createElement("div", null, /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentWrapper + " FPS_COMMENT_WRAPPER"
   }, isTask && /*#__PURE__*/React__default.createElement("div", {
@@ -26459,7 +26477,31 @@ function Comment(props) {
     }
   }, dict[lang].comments.anon), /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentBodyHeaderDate
-  }, formatDate(commentDate, formatCommentDate))), /*#__PURE__*/React__default.createElement("div", {
+  }, formatDate(commentDate, formatCommentDate))), isEditing ? /*#__PURE__*/React__default.createElement("div", {
+    className: styles$N.commentBodyText
+  }, /*#__PURE__*/React__default.createElement(Input, {
+    type: "textarea",
+    defaultValue: editText,
+    onChange: setEditText,
+    rows: "auto"
+  }), /*#__PURE__*/React__default.createElement("div", {
+    style: {
+      marginTop: '8px',
+      display: 'flex',
+      gap: '8px'
+    }
+  }, /*#__PURE__*/React__default.createElement(Button, {
+    loading: localLoading,
+    onClick: saveEdit,
+    small: true,
+    height: 32,
+    accent: true,
+    disabled: !editText
+  }, dict[lang].comments.save), /*#__PURE__*/React__default.createElement(Button, {
+    onClick: cancelEdit,
+    small: true,
+    height: 32
+  }, 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];
@@ -26470,12 +26512,15 @@ function Comment(props) {
       href: file,
       className: "icon icon-clip small " + styles$N.commentFileLink
     }, fileName));
-  }), _$1__default.includes(data.writeFields, _$1__default.get(data, "params._replyField")) && allowSend && /*#__PURE__*/React__default.createElement("div", {
+  }), !isEditing && (_$1__default.includes(data.writeFields, _$1__default.get(data, "params._replyField")) && allowSend || allowEdit && isAuthor) && /*#__PURE__*/React__default.createElement("div", {
     className: styles$N.commentBodyFooter
-  }, /*#__PURE__*/React__default.createElement("div", {
+  }, _$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)))), addReply && /*#__PURE__*/React__default.createElement("div", {
+  }, 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", {
     className: styles$N.childComments
   }, /*#__PURE__*/React__default.createElement(AddComment, _extends({}, props, {
     parentID: commentID,