From e85aaf431a3f64524753439789a8ed8cbc4cb492 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Wed, 23 Mar 2022 17:31:35 +0800 Subject: [PATCH] fix: gallery locked view Signed-off-by: Wing-Kam Wong --- .../project/spreadsheet/components/editableCell.vue | 1 + .../components/editableCell/editableAttachmentCell.vue | 6 +++--- .../project/spreadsheet/components/expandedForm.vue | 4 +++- .../components/project/spreadsheet/rowsXcDataTable.vue | 3 +++ .../components/project/spreadsheet/views/galleryView.vue | 6 ++++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue index 001ae68863..48707212be 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue @@ -18,6 +18,7 @@ :column="column" :is-public-grid="isPublic && !isForm" :is-public-form="isPublic && isForm" + :is-locked="isLocked" v-on="$listeners" /> diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue index 477ec6243c..2b488f5a5d 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue @@ -63,7 +63,7 @@ -
+
mdi-loading mdi-spin @@ -100,7 +100,7 @@
({ showborder: false, diff --git a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue index 0233fd07b3..22de323c49 100644 --- a/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue +++ b/packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue @@ -340,6 +340,7 @@ :sql-ui="sqlUi" :primary-value-column="primaryValueColumn" :cover-image-field="coverImageField" + :is-locked="isLocked" @expandForm="({rowIndex,rowMeta}) => expandRow(rowIndex,rowMeta)" /> @@ -606,6 +607,7 @@ :query-params="queryParams" :show-next-prev="false" :preset-values="presetValues" + :is-locked="isLocked" @cancel="showExpandModal = false;" @input="showExpandModal = false; (kanban.selectedExpandRow && kanban.selectedExpandRow.rowMeta && delete kanban.selectedExpandRow.rowMeta.new) ; loadKanbanData(false)" @commented="reloadComments" @@ -632,6 +634,7 @@ :query-params="queryParams" :show-next-prev="true" :preset-values="presetValues" + :is-locked="isLocked" @cancel="showExpandModal = false;" @input="showExpandModal = false; (data[selectedExpandRowIndex] && data[selectedExpandRowIndex].rowMeta && delete data[selectedExpandRowIndex].rowMeta.new) ; loadTableData()" @commented="reloadComments" diff --git a/packages/nc-gui/components/project/spreadsheet/views/galleryView.vue b/packages/nc-gui/components/project/spreadsheet/views/galleryView.vue index bbf2136fad..e545d5e362 100644 --- a/packages/nc-gui/components/project/spreadsheet/views/galleryView.vue +++ b/packages/nc-gui/components/project/spreadsheet/views/galleryView.vue @@ -10,7 +10,7 @@ @@ -108,7 +109,8 @@ export default { 'primaryValueColumn', 'showSystemFields', 'sqlUi', - 'coverImageField' + 'coverImageField', + 'isLocked' ], computed: { attachmentColumn() {