diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx index 7675b860f..582a7bd99 100644 --- a/apps/common/mobile/lib/view/collaboration/Comments.jsx +++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx @@ -639,6 +639,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o const viewMode = !storeAppOptions.canComments; const comments = storeComments.groupCollectionFilter || storeComments.collectionComments; + const isEdit = storeAppOptions.isEdit; const sortComments = comments.length > 0 ? [...comments].sort((a, b) => a.time > b.time ? -1 : 1) : null; const [clickComment, setComment] = useState(); @@ -674,7 +675,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
{comment.date}
- {!viewMode && + {isEdit && !viewMode &&
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{onResolveComment(comment);}}>
} {(displayMode === 'markup' && !wsProps?.Objects) && @@ -707,7 +708,7 @@ const ViewComments = inject("storeComments", "storeAppOptions", "storeReview")(o
{reply.date}
- {!viewMode && reply.editable && + {isEdit && !viewMode && reply.editable &&
{setComment(comment); setReply(reply); openActionReply(true);}} @@ -748,6 +749,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob const displayMode = storeReview.displayMode; const viewMode = !storeAppOptions.canComments; + const isEdit = storeAppOptions.isEdit; const comments = storeComments.showComments; const [currentIndex, setCurrentIndex] = useState(0); @@ -784,7 +786,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob return ( - {!viewMode && + {isEdit && !viewMode && {onCommentMenuClick('addReply', comment);}}>{_t.textAddReply} }
@@ -804,7 +806,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{comment.date}
- {!viewMode && + {isEdit && !viewMode &&
{(comment.editable && displayMode === 'markup' && !wsProps?.Objects) &&
{onResolveComment(comment);}}>
} {(displayMode === 'markup' && !wsProps?.Objects) && @@ -837,7 +839,7 @@ const CommentList = inject("storeComments", "storeAppOptions", "storeReview")(ob
{reply.date}
- {!viewMode && reply.editable && + {isEdit && !viewMode && reply.editable &&
{setReply(reply); openActionReply(true);}} diff --git a/apps/common/mobile/resources/less/common-ios.less b/apps/common/mobile/resources/less/common-ios.less index ec6c1dea7..060ecd1bc 100644 --- a/apps/common/mobile/resources/less/common-ios.less +++ b/apps/common/mobile/resources/less/common-ios.less @@ -119,6 +119,9 @@ .navbar-bg { //-webkit-backdrop-filter: none; backdrop-filter: none; + &::after { + background: @background-menu-divider; + } } .list:first-child { diff --git a/apps/spreadsheeteditor/mobile/src/less/app.less b/apps/spreadsheeteditor/mobile/src/less/app.less index b22abf0b7..323279360 100644 --- a/apps/spreadsheeteditor/mobile/src/less/app.less +++ b/apps/spreadsheeteditor/mobile/src/less/app.less @@ -164,4 +164,13 @@ border-color: transparent; } } +} + +.sheet-filter, .popover-filter { + ul li:first-child .list-button{ + color: @text-normal; + &::after { + background: @background-menu-divider; + } + } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx b/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx index 20b77dc1f..87191bf85 100644 --- a/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx +++ b/apps/spreadsheeteditor/mobile/src/view/FilterOptions.jsx @@ -55,7 +55,7 @@ const FilterOptions = (props) => { - {_t.textClearFilter} + {_t.textClearFilter} props.onDeleteFilter()} id="btn-delete-filter">{_t.textDeleteFilter} @@ -72,10 +72,10 @@ const FilterOptions = (props) => { const FilterView = (props) => { return ( !Device.phone ? - + : - + )