Browse Source

Merge pull request #3319 from nocodb/fix/gui-v2-excel-import

fix(gui-v2): incorrect sheet names in excel import
pull/3324/head
Raju Udava 2 years ago committed by GitHub
parent
commit
125d1931fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      packages/nc-gui-v2/components/template/Editor.vue

12
packages/nc-gui-v2/components/template/Editor.vue

@ -92,7 +92,7 @@ const data = reactive<{ title: string | null; name: string; tables: (TableType &
const validators = computed(() => const validators = computed(() =>
data.tables.reduce<Record<string, [typeof fieldRequiredValidator]>>((acc, table, tableIdx) => { data.tables.reduce<Record<string, [typeof fieldRequiredValidator]>>((acc, table, tableIdx) => {
acc[`tables.${tableIdx}.table_name`] = [fieldRequiredValidator] acc[`tables.${tableIdx}.ref_table_name`] = [fieldRequiredValidator]
hasSelectColumn.value[tableIdx] = false hasSelectColumn.value[tableIdx] = false
table.columns?.forEach((column, columnIdx) => { table.columns?.forEach((column, columnIdx) => {
@ -425,8 +425,8 @@ async function importTemplate() {
} }
} }
const tableMeta = await $api.dbTable.create(project?.value?.id as string, { const tableMeta = await $api.dbTable.create(project?.value?.id as string, {
table_name: table.table_name, table_name: table.ref_table_name,
// leave title empty to get a generated one based on table_name // leave title empty to get a generated one based on ref_table_name
title: '', title: '',
columns: table.columns, columns: table.columns,
}) })
@ -581,9 +581,9 @@ onMounted(() => {
> >
<a-collapse-panel v-for="(table, tableIdx) of data.tables" :key="tableIdx"> <a-collapse-panel v-for="(table, tableIdx) of data.tables" :key="tableIdx">
<template #header> <template #header>
<a-form-item v-if="editableTn[tableIdx]" v-bind="validateInfos[`tables.${tableIdx}.table_name`]" no-style> <a-form-item v-if="editableTn[tableIdx]" v-bind="validateInfos[`tables.${tableIdx}.ref_table_name`]" no-style>
<a-input <a-input
v-model:value="table.table_name" v-model:value="table.ref_table_name"
class="max-w-xs" class="max-w-xs"
size="large" size="large"
hide-details hide-details
@ -595,7 +595,7 @@ onMounted(() => {
<span v-else class="font-weight-bold text-lg flex items-center gap-2" @click="setEditableTn(tableIdx, true)"> <span v-else class="font-weight-bold text-lg flex items-center gap-2" @click="setEditableTn(tableIdx, true)">
<mdi-table class="text-primary" /> <mdi-table class="text-primary" />
{{ table.table_name }} {{ table.ref_table_name }}
</span> </span>
</template> </template>

Loading…
Cancel
Save