-
+
- {{ log.display_name?.trim() || log.user || 'Shared source' }}
+ {{ audit.display_name?.trim() || audit.user || 'Shared source' }}
{
display: 'inline',
}"
>
- {{ log.display_name?.trim() || log.user || 'Shared source' }}
+ {{ audit.display_name?.trim() || audit.user || 'Shared source' }}
-
- {{ timeAgo(log.created_at) }}
+
+ {{ timeAgo(audit.created_at) }}
-
+
@@ -358,6 +388,12 @@ watch(commentsWrapperEl, () => {
@apply max-w-1/2;
}
+.nc-comment-input {
+ :deep(.nc-comment-rich-editor) {
+ @apply !ml-1;
+ }
+}
+
.nc-audit-item {
@apply border-b-1 gap-3 border-gray-200;
}
@@ -386,6 +422,7 @@ watch(commentsWrapperEl, () => {
}
:deep(.ant-tabs) {
+ @apply !overflow-visible;
.ant-tabs-nav {
@apply px-3;
.ant-tabs-nav-list {
@@ -407,21 +444,11 @@ watch(commentsWrapperEl, () => {
}
}
-.nc-comment-description {
- pre {
- @apply !mb-0 py-[1px] !text-small !text-gray-700 !leading-18px;
- white-space: break-spaces;
- font-size: unset;
- font-family: unset;
- }
-}
-.expanded-form-comment-input-wrapper {
- @apply flex-1 bg-white rounded-lg relative;
-}
:deep(.expanded-form-comment-input) {
- @apply transition-all duration-150;
+ @apply transition-all duration-150 min-h-8;
box-shadow: none;
- &:focus {
+ &:focus,
+ &:focus-within {
@apply min-h-16;
}
&::placeholder {
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/RichComment.vue b/packages/nc-gui/components/smartsheet/expanded-form/RichComment.vue
new file mode 100644
index 0000000000..f9b63173bc
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/expanded-form/RichComment.vue
@@ -0,0 +1,380 @@
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/RichTextOptions.vue b/packages/nc-gui/components/smartsheet/expanded-form/RichTextOptions.vue
new file mode 100644
index 0000000000..4238e7fea4
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/expanded-form/RichTextOptions.vue
@@ -0,0 +1,215 @@
+
+
+
+
+
+
+
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/index.vue b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
index 003706f640..6c0dac31e7 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/index.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/index.vue
@@ -129,7 +129,8 @@ const {
saveRowAndStay,
row: _row,
save: _save,
- loadCommentsAndLogs,
+ loadComments,
+ loadAudits,
clearColumns,
} = useProvideExpandedFormStore(meta, row)
@@ -320,13 +321,13 @@ onMounted(async () => {
if (props.loadRow) {
await _loadRow()
- await loadCommentsAndLogs()
+ await Promise.all([loadComments(), loadAudits()])
}
if (props.rowId) {
try {
await _loadRow(props.rowId)
- await loadCommentsAndLogs()
+ await Promise.all([loadComments(), loadAudits()])
} catch (e: any) {
if (e.response?.status === 404) {
message.error(t('msg.noRecordFound'))
@@ -458,7 +459,7 @@ const onConfirmDeleteRowClick = async () => {
watch(rowId, async (nRow) => {
await _loadRow(nRow)
- await loadCommentsAndLogs()
+ await Promise.all([loadComments(), loadAudits()])
})
const showRightSections = computed(() => {
@@ -617,7 +618,7 @@ export default {
{{ props.newRecordHeader ?? $t('activity.newRecord') }}