diff --git a/README.md b/README.md index 941a7e8934..0623a16f3d 100644 --- a/README.md +++ b/README.md @@ -250,7 +250,7 @@ Access Dashboard using: [http://localhost:8080/dashboard](http://localhost:8080/ ### App Store for Workflow Automations -We provide different integrations in three main categories. See App Store for details. +We provide different integrations in three main categories. See App Store for details. - ⚡  Chat: Slack, Discord, Mattermost, and etc - ⚡  Email: AWS SES, SMTP, MailerSend, and etc diff --git a/packages/nc-gui/assets/nc-icons/arrow-down.svg b/packages/nc-gui/assets/nc-icons/arrow-down.svg new file mode 100644 index 0000000000..cb6599ab1b --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/arrow-down.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/nc-gui/assets/nc-icons/arrow-up.svg b/packages/nc-gui/assets/nc-icons/arrow-up.svg new file mode 100644 index 0000000000..812dbfd386 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/arrow-up.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/nc-gui/assets/nc-icons/chevron-down.svg b/packages/nc-gui/assets/nc-icons/chevron-down.svg new file mode 100644 index 0000000000..0b0d8c8e04 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/chevron-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/packages/nc-gui/assets/nc-icons/copy.svg b/packages/nc-gui/assets/nc-icons/copy.svg new file mode 100644 index 0000000000..c88b1da9a5 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/copy.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/download.svg b/packages/nc-gui/assets/nc-icons/download.svg index 2403b35d0e..cb7eed4256 100644 --- a/packages/nc-gui/assets/nc-icons/download.svg +++ b/packages/nc-gui/assets/nc-icons/download.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/packages/nc-gui/assets/nc-icons/duplicate.svg b/packages/nc-gui/assets/nc-icons/duplicate.svg new file mode 100644 index 0000000000..ce9269e3db --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/duplicate.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/edit.svg b/packages/nc-gui/assets/nc-icons/edit.svg new file mode 100644 index 0000000000..fe5c8a9b2b --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/edit.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/eye.svg b/packages/nc-gui/assets/nc-icons/eye.svg index 4477b47d64..3e19595fa4 100644 --- a/packages/nc-gui/assets/nc-icons/eye.svg +++ b/packages/nc-gui/assets/nc-icons/eye.svg @@ -1,4 +1,4 @@ - + diff --git a/packages/nc-gui/assets/nc-icons/paste.svg b/packages/nc-gui/assets/nc-icons/paste.svg new file mode 100644 index 0000000000..0a46a4c8f8 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/paste.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/nc-gui/assets/nc-icons/pencil.svg b/packages/nc-gui/assets/nc-icons/pencil.svg new file mode 100644 index 0000000000..5e4bc9914e --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/pencil.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/rename.svg b/packages/nc-gui/assets/nc-icons/rename.svg new file mode 100644 index 0000000000..4f3ee84e6b --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/rename.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/nc-gui/assets/nc-icons/trash.svg b/packages/nc-gui/assets/nc-icons/trash.svg new file mode 100644 index 0000000000..49e05923ec --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/trash.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/upload.svg b/packages/nc-gui/assets/nc-icons/upload.svg index 0e2e786b63..fa26eb96e0 100644 --- a/packages/nc-gui/assets/nc-icons/upload.svg +++ b/packages/nc-gui/assets/nc-icons/upload.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/packages/nc-gui/assets/nc-icons/user.svg b/packages/nc-gui/assets/nc-icons/user.svg new file mode 100644 index 0000000000..d7034eb189 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/user.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/nc-gui/components/cell/RichText.vue b/packages/nc-gui/components/cell/RichText.vue index fecd9c0e4c..955d9296dc 100644 --- a/packages/nc-gui/components/cell/RichText.vue +++ b/packages/nc-gui/components/cell/RichText.vue @@ -8,7 +8,7 @@ import { generateJSON } from '@tiptap/html' import Underline from '@tiptap/extension-underline' import { TaskItem } from '@/helpers/dbTiptapExtensions/task-item' import { Link } from '@/helpers/dbTiptapExtensions/links' -import { IsExpandedFormOpenInj, ReadonlyInj, RowHeightInj } from '#imports' +import { IsExpandedFormOpenInj, IsFormInj, ReadonlyInj, RowHeightInj } from '#imports' const props = defineProps<{ value?: string | null @@ -26,6 +26,8 @@ const rowHeight = inject(RowHeightInj, ref(1 as const)) const readOnlyCell = inject(ReadonlyInj, ref(false)) +const isForm = inject(IsFormInj, ref(false)) + const turndownService = new TurndownService({}) turndownService.addRule('lineBreak', { @@ -199,7 +201,8 @@ watch(editorDom, () => { 'mt-2.5 flex-grow': fullMode, 'nc-scrollbar-md': !fullMode || (!fullMode && isExpandedFormOpen), 'flex-grow': isExpandedFormOpen, - [`!overflow-hidden children:line-clamp-${rowHeight}`]: !fullMode && readOnly && rowHeight && !isExpandedFormOpen, + [`!overflow-hidden children:line-clamp-${rowHeight}`]: + !fullMode && readOnly && rowHeight && !isExpandedFormOpen && !isForm, }" /> diff --git a/packages/nc-gui/components/cell/TextArea.vue b/packages/nc-gui/components/cell/TextArea.vue index 250ede61ff..606fe8c549 100644 --- a/packages/nc-gui/components/cell/TextArea.vue +++ b/packages/nc-gui/components/cell/TextArea.vue @@ -207,15 +207,15 @@ watch(inputWrapperRef, () => { :class="{ 'min-h-10': rowHeight !== 1 || isExpandedFormOpen, 'min-h-9': rowHeight === 1 && !isExpandedFormOpen, - 'h-full': isForm, + 'h-full w-full': isForm, }" >
{ v-if="!isVisible" placement="bottom" class="!absolute right-0 hidden nc-text-area-expand-btn group-hover:block z-3" - :class="isExpandedFormOpen || isForm || isRichMode ? 'top-1' : 'bottom-1'" + :class="isExpandedFormOpen || isForm ? 'top-1' : 'bottom-1'" > diff --git a/packages/nc-gui/components/cell/attachment/Modal.vue b/packages/nc-gui/components/cell/attachment/Modal.vue index bd5a8d5117..0e0bb4bdf7 100644 --- a/packages/nc-gui/components/cell/attachment/Modal.vue +++ b/packages/nc-gui/components/cell/attachment/Modal.vue @@ -158,8 +158,8 @@ const handleFileDelete = (i: number) => { -
- +
+
@@ -249,7 +249,8 @@ const handleFileDelete = (i: number) => { } } - .nc-attachment-download { + .nc-attachment-download, + .nc-attachment-rename { @apply bg-white absolute bottom-2 right-2; @apply transition-opacity duration-150 ease-in opacity-0 hover:ring; @apply cursor-pointer rounded shadow flex items-center p-1 border-1; diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue index c21832cfd4..1f14ae556e 100644 --- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue +++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue @@ -463,7 +463,7 @@ const projectDelete = () => {