github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fix: json import - correction in file upload 

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/2399/head
Pranav C 2 years ago
parent
8d5c40c068
commit
0544976730
1 changed files with 67 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 144
      packages/nc-gui/components/import/JSONImport.vue

144
packages/nc-gui/components/import/JSONImport.vue
Unescape View File

@ -9,54 +9,54 @@
</v-icon> </v-icon>
<span class="caption text-capitalize">Upload</span> <span class="caption text-capitalize">Upload</span>
</v-tab> </v-tab>
<v-tab> <!-- <v-tab>-->
<!-- <v-icon small class="mr-1"> <!-- <v-icon small class="mr-1">
mdi-link-variant mdi-link-variant
</v-icon> </v-icon>
<span class="caption text-capitalize">URL</span> <span class="caption text-capitalize">URL</span>
</v-tab>--> </v-tab>-->
<v-tab> <v-tab>
<v-icon small class="mr-1"> <v-icon small class="mr-1">
mdi-link-variant mdi-link-variant
</v-icon> </v-icon>
<span class="caption text-capitalize">String</span> <span class="caption text-capitalize">String</span>
</v-tab> </v-tab>
<v-tab-item> <v-tab-item>
<div class="nc-json-import-tab-item "> <div class="nc-json-import-tab-item ">
<div <div
class="nc-droppable d-flex align-center justify-center flex-column" class="nc-droppable d-flex align-center justify-center flex-column"
:style="{ :style="{
background : dragOver ? '#7772' : '' background : dragOver ? '#7772' : ''
}" }"
@click="$refs.file.click()" @click="$refs.file.click()"
@drop.prevent="dropHandler" @drop.prevent="dropHandler"
@dragover.prevent="dragOver = true" @dragover.prevent="dragOver = true"
@dragenter.prevent="dragOver = true" @dragenter.prevent="dragOver = true"
@dragexit="dragOver = false" @dragexit="dragOver = false"
@dragleave="dragOver = false" @dragleave="dragOver = false"
@dragend="dragOver = false" @dragend="dragOver = false"
> >
<x-icon :color="['primary','grey']" size="50"> <x-icon :color="['primary','grey']" size="50">
mdi-file-plus-outline mdi-file-plus-outline
</x-icon> </x-icon>
<p class="title mb-1 mt-2"> <p class="title mb-1 mt-2">
<!-- Select File to Upload--> <!-- Select File to Upload-->
{{ $t('msg.info.upload') }} {{ $t('msg.info.upload') }}
</p> </p>
<p class="grey--text mb-1"> <p class="grey--text mb-1">
<!-- or drag and drop file--> <!-- or drag and drop file-->
{{ $t('msg.info.upload_sub') }} {{ $t('msg.info.upload_sub') }}
</p> </p>
<p v-if="quickImportType == 'excel'" class="caption grey--text"> <p v-if="quickImportType == 'excel'" class="caption grey--text">
<!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots --> <!-- Supported: .xls, .xlsx, .xlsm, .ods, .ots -->
{{ $t('msg.info.excelSupport') }} {{ $t('msg.info.excelSupport') }}
</p> </p>
</div>
</div> </div>
</v-tab-item> </div>
<!-- <v-tab-item> </v-tab-item>
<!-- <v-tab-item>
<div class="nc-json-import-tab-item align-center"> <div class="nc-json-import-tab-item align-center">
<div class="pa-4 d-100 h-100"> <div class="pa-4 d-100 h-100">
<v-form ref="form" v-model="valid"> <v-form ref="form" v-model="valid">
@ -85,33 +85,32 @@
</div> </div>
</div> </div>
</v-tab-item>--> </v-tab-item>-->
<v-tab-item> <v-tab-item>
<div class="nc-json-import-tab-item align-center"> <div class="nc-json-import-tab-item align-center">
<div class="pa-4 d-100 h-100"> <div class="pa-4 d-100 h-100">
<v-form ref="form" v-model="valid"> <v-form ref="form" v-model="valid">
<div class="nc-json-editor-wrapper"> <div class="nc-json-editor-wrapper">
<v-btn small class="nc-json-format-btn" @click="formatJson"> <v-btn small class="nc-json-format-btn" @click="formatJson">
Format Format
</v-btn> </v-btn>
<!--label="Enter excel file url"--> <!--label="Enter excel file url"-->
<monaco-json-editor <monaco-json-editor
ref="editor" ref="editor"
v-model="jsonString" v-model="jsonString"
style="height:320px" style="height:320px"
/> />
<div class="text-center mt-4"> <div class="text-center mt-4">
<v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString"> <v-btn v-t="['c:project:create:excel:load-url']" class="ml-3" color="primary" @click="loadJsonString">
<!--Load--> <!--Load-->
{{ $t('general.load') }} {{ $t('general.load') }}
</v-btn> </v-btn>
</div>
</div> </div>
</v-form> </div>
</div> </v-form>
</div> </div>
</v-tab-item> </div>
</v-tab> </v-tab-item>
</v-tabs> </v-tabs>
<div class="px-4 pb-2"> <div class="px-4 pb-2">
@ -166,15 +165,6 @@
<v-tooltip bottom> <v-tooltip bottom>
<template #activator="{on}"> <template #activator="{on}">
<input <input
v-if="quickImportType == 'excel'"
ref="file"
class="nc-json-import-input"
type="file"
style="display: none"
@change="_change($event)"
>
<input
v-if="quickImportType == 'csv'"
ref="file" ref="file"
class="nc-json-import-input" class="nc-json-import-input"
type="file" type="file"
@ -341,7 +331,7 @@ export default {
console.log('error', e) console.log('error', e)
this.$store.commit('loader/MutClear') this.$store.commit('loader/MutClear')
} }
reader.readAsArrayBuffer(file) reader.readAsText(file)
}, },
async parseAndExtractData(type, val, name) { async parseAndExtractData(type, val, name) {

Write Preview
Loading…
Cancel
Save