From afcb955071c61af3fe9c60060070e6bf598fe333 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Sun, 31 Oct 2021 17:47:58 +0530 Subject: [PATCH] fix: enable attachment upload in shared view re #687 Signed-off-by: Pranav C --- .../project/appStore/inputs/attachment.vue | 2 +- .../components/project/settings/xcMeta.vue | 2 +- .../spreadsheet/components/editableCell.vue | 2 + .../editableCell/editableAttachmentCell.vue | 93 ++++++++--- .../editableCell/editableUrlCell.vue | 24 +++ .../project/spreadsheet/helpers/imageExt.js | 2 +- .../project/spreadsheet/public/xcForm.vue | 37 ++++- packages/nc-gui/pages/projects/index.vue | 2 +- packages/nc-gui/store/sqlMgr.js | 31 +++- .../nocodb/src/interface/IStorageAdapter.ts | 1 + .../nocodb/src/lib/noco/meta/NcMetaMgr.ts | 153 ++++++++++++------ 11 files changed, 262 insertions(+), 87 deletions(-) diff --git a/packages/nc-gui/components/project/appStore/inputs/attachment.vue b/packages/nc-gui/components/project/appStore/inputs/attachment.vue index 2237abfb9f..6943097437 100644 --- a/packages/nc-gui/components/project/appStore/inputs/attachment.vue +++ b/packages/nc-gui/components/project/appStore/inputs/attachment.vue @@ -246,7 +246,7 @@ export default { } this.uploading = true for (const file of this.$refs.file.files) { - const item = await this.$store.dispatch('sqlMgr/ActUpload', [{ + const item = await this.$store.dispatch('sqlMgr/ActUploadOld', [{ dbAlias: this.dbAlias }, 'xcAttachmentUpload', { public: true }, file]) this.localState.push(item) diff --git a/packages/nc-gui/components/project/settings/xcMeta.vue b/packages/nc-gui/components/project/settings/xcMeta.vue index 3e943f6b22..52add14c24 100644 --- a/packages/nc-gui/components/project/settings/xcMeta.vue +++ b/packages/nc-gui/components/project/settings/xcMeta.vue @@ -288,7 +288,7 @@ export default { this.loading = 'import-zip' try { this.$refs.importFile.value = '' - await this.$store.dispatch('sqlMgr/ActUpload', [ + await this.$store.dispatch('sqlMgr/ActUploadOld', [ { env: '_noco' }, diff --git a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue index 914e18fe9f..983bc6c30d 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell.vue @@ -13,8 +13,10 @@ :active="active" :db-alias="dbAlias" :meta="meta" + :is-form="isForm" :column="column" :is-public-grid="isPublic && !isForm" + :is-public-form="isPublic && isForm" 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 97c0b748d1..97f70f5562 100644 --- a/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue +++ b/packages/nc-gui/components/project/spreadsheet/components/editableCell/editableAttachmentCell.vue @@ -19,8 +19,8 @@
@@ -32,9 +32,9 @@ alt="#" max-height="33px" contain - :src="item.url" + :src="item.url || item.data" v-on="on" - @click="selectImage(item.url,i)" + @click="selectImage(item.url || item.data,i)" > - + {{ item.icon }} - + mdi-file @@ -82,7 +87,13 @@
- + mdi-link-variant @@ -97,13 +108,18 @@ class="row" @update="onOrderUpdate" > - + - + mdi-close-circle @@ -114,16 +130,16 @@ v-if="isImage(item.title)" style="max-height: 100%;max-width: 100%" alt="#" - :src="item.url" + :src="item.url || item.data" @click="selectImage(item.url,i)" > - + {{ item.icon }} - + mdi-file
@@ -144,7 +160,7 @@