diff --git a/packages/nc-gui/assets/icons/FileIconImageBox.png b/packages/nc-gui/assets/icons/FileIconImageBox.png index c2ac3cb103..9815024ca0 100644 Binary files a/packages/nc-gui/assets/icons/FileIconImageBox.png and b/packages/nc-gui/assets/icons/FileIconImageBox.png differ diff --git a/packages/nc-gui/assets/nc-icons/belongsto.svg b/packages/nc-gui/assets/nc-icons/belongsto.svg new file mode 100644 index 0000000000..306bb782bd --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/belongsto.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/file.svg b/packages/nc-gui/assets/nc-icons/file.svg new file mode 100644 index 0000000000..931fe7264a --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/file.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/hasmany.svg b/packages/nc-gui/assets/nc-icons/hasmany.svg new file mode 100644 index 0000000000..0514bae918 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/hasmany.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/info.svg b/packages/nc-gui/assets/nc-icons/info.svg new file mode 100644 index 0000000000..4d7f8e313f --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/info.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/manytomany.svg b/packages/nc-gui/assets/nc-icons/manytomany.svg new file mode 100644 index 0000000000..9ccae85eec --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/manytomany.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/maximize.svg b/packages/nc-gui/assets/nc-icons/maximize.svg new file mode 100644 index 0000000000..5ebeb1d312 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/maximize.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/multi-file.svg b/packages/nc-gui/assets/nc-icons/multi-file.svg new file mode 100644 index 0000000000..b9540989e4 --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/multi-file.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packages/nc-gui/assets/nc-icons/onetoone.svg b/packages/nc-gui/assets/nc-icons/onetoone.svg new file mode 100644 index 0000000000..e95ce0646f --- /dev/null +++ b/packages/nc-gui/assets/nc-icons/onetoone.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss index c50fa26b64..192fe47592 100644 --- a/packages/nc-gui/assets/style.scss +++ b/packages/nc-gui/assets/style.scss @@ -422,7 +422,7 @@ a { } .ant-modal { - @apply !top-[50px]; + @apply !top-[50px] !w-[700px]; } .ant-modal-content { @apply !p-6; @@ -542,3 +542,48 @@ a { input[type='number'] { @apply !outline-none !ring-0 !border-0; } + +.ant-pagination { + @apply !flex !flex-row !gap-1; +} + +.ant-pagination .ant-pagination-prev { + @apply !border-1 !rounded-md !border-gray-200 transform scale-95; +} + +.ant-pagination .ant-pagination-item { + @apply !bg-white !rounded-md !border-1 !scale-110 !border-gray-200 !flex !items-center !justify-center; +} + +.ant-pagination .ant-pagination-item a { + @apply !no-underline !text-gray-700; +} +.ant-pagination .ant-pagination-item-active a { + @apply !text-brand-500; +} + +.ant-pagination .ant-pagination-next { + @apply !border-1 !rounded-md !border-gray-200 scale-95; +} + +.ant-pagination .ant-pagination-item-active { + @apply !bg-brand-50 !text-brand-500 !border-0 !scale-110; +} +.ant-pagination .ant-pagination-item-link { + @apply !flex !items-center !justify-center; +} + +.ant-pagination .ant-pagination-jump-next-custom-icon .ant-pagination-item-link { + @apply !block; +} +.ant-pagination .ant-pagination-jump-prev-custom-icon .ant-pagination-item-link { + @apply !block; +} + +.ant-card-body { + @apply !p-2; +} + +.ant-pagination .ant-pagination-item-link-icon { + @apply !block !py-1.5; +} diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue index 9a71313a8a..e3de75a925 100644 --- a/packages/nc-gui/components/smartsheet/Cell.vue +++ b/packages/nc-gui/components/smartsheet/Cell.vue @@ -6,6 +6,7 @@ import { ColumnInj, EditColumnInj, EditModeInj, + IsExpandedFormOpenInj, IsFormInj, IsLockedInj, IsPublicInj, @@ -90,6 +91,8 @@ const isSurveyForm = inject(IsSurveyFormInj, ref(false)) const isEditColumnMenu = inject(EditColumnInj, ref(false)) +const isExpandedFormOpen = inject(IsExpandedFormOpenInj, ref(false)) + const { currentRow } = useSmartsheetRowStoreOrThrow() const { sqlUis } = storeToRefs(useProject()) @@ -200,7 +203,7 @@ onUnmounted(() => { class="nc-cell w-full h-full relative" :class="[ `nc-cell-${(column?.uidt || 'default').toLowerCase()}`, - { 'text-blue-600': isPrimary(column) && !props.virtual && !isForm }, + { 'text-brand-500': isPrimary(column) && !props.virtual && !isForm }, { 'nc-grid-numeric-cell': isGrid && !isForm && isNumericField }, { 'h-[40px]': !props.editEnabled && isForm && !isSurveyForm && !isAttachment(column) && !props.virtual }, ]" diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue index 991daa19e2..0de4f5c584 100644 --- a/packages/nc-gui/components/smartsheet/expanded-form/Header.vue +++ b/packages/nc-gui/components/smartsheet/expanded-form/Header.vue @@ -20,7 +20,7 @@ const route = useRoute() const { meta, isSqlView } = useSmartsheetStoreOrThrow() -const { commentsDrawer, displayValue, primaryKey, save: _save, loadRow } = useExpandedFormStoreOrThrow() +const { commentsDrawer, displayValue, primaryKey, save: _save, loadRow, deleteRowById } = useExpandedFormStoreOrThrow() const { isNew, syncLTARRefs, state } = useSmartsheetRowStoreOrThrow() @@ -72,8 +72,6 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => { const showDeleteRowModal = ref(false) -const { deleteRowById } = useViewData(meta, ref(props.view)) - const onDeleteRowClick = () => { showDeleteRowModal.value = true } @@ -81,7 +79,7 @@ const onDeleteRowClick = () => { const onConfirmDeleteRowClick = async () => { showDeleteRowModal.value = false await deleteRowById(primaryKey.value) - reloadTrigger.trigger() + await reloadTrigger.trigger() emit('cancel') message.success('Row deleted') } diff --git a/packages/nc-gui/components/smartsheet/header/Cell.vue b/packages/nc-gui/components/smartsheet/header/Cell.vue index 4ba762705d..1887328765 100644 --- a/packages/nc-gui/components/smartsheet/header/Cell.vue +++ b/packages/nc-gui/components/smartsheet/header/Cell.vue @@ -6,6 +6,7 @@ interface Props { column: ColumnType required?: boolean | number hideMenu?: boolean + hideIcon?: boolean } const props = defineProps() @@ -53,7 +54,7 @@ const openHeaderMenu = () => { @click.right="isDropDownOpen = !isDropDownOpen" @click="isDropDownOpen = false" > - +
{ diff --git a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue index fad5af03b7..153537e894 100644 --- a/packages/nc-gui/components/smartsheet/header/VirtualCell.vue +++ b/packages/nc-gui/components/smartsheet/header/VirtualCell.vue @@ -22,7 +22,7 @@ import { useUIPermission, } from '#imports' -const props = defineProps<{ column: ColumnType; hideMenu?: boolean; required?: boolean | number }>() +const props = defineProps<{ column: ColumnType; hideMenu?: boolean; required?: boolean | number; hideIcon?: boolean }>() const { t } = useI18n() @@ -126,7 +126,7 @@ const closeAddColumnDropdown = () => { :class="{ 'h-full': column }" @click.right="isDropDownOpen = !isDropDownOpen" > - +