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

revert: previous merge 

Signed-off-by: Raju Udava <sivadstala@gmail.com>
pull/764/head
Raju Udava 3 years ago
parent
847c1a0f2a
commit
76b47597f8
5 changed files with 24 additions and 71 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. 71
      packages/nc-gui/components/ProjectTreeView.vue
  2. 10
      packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
  3. 4
      packages/nc-gui/components/project/table.vue
  4. 2
      packages/nc-gui/components/projectTabs.vue
  5. 4
      packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts

71
packages/nc-gui/components/ProjectTreeView.vue
Unescape View File

@ -26,24 +26,16 @@
&lt;!&ndash; <v-icon v-else>mdi-arrow-expand-horizontal</v-icon>&ndash;&gt; &lt;!&ndash; <v-icon v-else>mdi-arrow-expand-horizontal</v-icon>&ndash;&gt;
</v-btn>--> </v-btn>-->
<v-text-field <!-- <v-text-field-->
v-model="search" <!-- v-model="search"-->
placeholder="Search tables" <!-- label="Search Project"-->
dense <!-- dense-->
hide-details <!-- solo-->
class="elevation-0 mr-2 pl-3 pr-1 caption nc-table-list-filter" <!-- hide-details-->
> <!-- clearable-->
<template #prepend-inner> <!-- clear-icon="mdi-close-circle-outline"-->
<v-icon small class="mt-2 ml-2 mr-1 "> <!-- class="pa-2"-->
mdi-magnify <!-- ></v-text-field>-->
</v-icon>
</template>
<template #append>
<v-icon v-if="search" class="mt-3 mr-3" color="grey" x-small @click="search=''">
mdi-close
</v-icon>
</template>
</v-text-field>
<v-skeleton-loader <v-skeleton-loader
v-if="!projects || !projects.length" v-if="!projects || !projects.length"
@ -116,7 +108,7 @@
</v-tooltip> </v-tooltip>
</template> </template>
</v-treeview> </v-treeview>
<v-container v-else fluid class="px-1 pt-0"> <v-container v-else fluid class="px-1">
<v-list dense expand class="nc-project-tree nc-single-env-project-tree"> <v-list dense expand class="nc-project-tree nc-single-env-project-tree">
<template v-for="item in listViewArr"> <template v-for="item in listViewArr">
<!-- v-if="item.children && item.children.length"--> <!-- v-if="item.children && item.children.length"-->
@ -124,7 +116,7 @@
v-if="isNested(item) && showNode(item)" v-if="isNested(item) && showNode(item)"
:key="item.type" :key="item.type"
color="textColor" color="textColor"
:value="isActiveList(item) || search" :value="isActiveList(item)"
@click=" @click="
!(item.children && item.children.length) && addTab({ ...item }, false, false) !(item.children && item.children.length) && addTab({ ...item }, false, false)
" "
@ -139,7 +131,7 @@
<v-list-item-icon> <v-list-item-icon>
<v-icon <v-icon
v-if="open && icons[item._nodes.type].openIcon" v-if="open && icons[item._nodes.type].openIcon"
small x-small
style="cursor: auto" style="cursor: auto"
:color="icons[item._nodes.type].openColor" :color="icons[item._nodes.type].openColor"
> >
@ -147,7 +139,7 @@
</v-icon> </v-icon>
<v-icon <v-icon
v-else v-else
small x-small
style="cursor: auto" style="cursor: auto"
:color="icons[item._nodes.type].color" :color="icons[item._nodes.type].color"
> >
@ -157,25 +149,17 @@
<v-list-item-title> <v-list-item-title>
<v-tooltip v-if="!isNonAdminAccessAllowed(item)" top> <v-tooltip v-if="!isNonAdminAccessAllowed(item)" top>
<template #activator="{ on }"> <template #activator="{ on }">
<span v-if="item.type === 'tableDir'" class="caption font-weight-regular" v-on="on"> <span class="caption font-weight-regular" v-on="on">
Tables<template v-if="item.children && item.children.length"> ({{
item.children.filter(child => !search || child.name.toLowerCase().includes(search.toLowerCase())).length
}})</template></span>
<span v-else class="caption font-weight-regular" v-on="on">
{{ item.name }}</span> {{ item.name }}</span>
</template> </template>
<span class="caption">Only visible to Creator</span> <span class="caption">Only visible to Creator</span>
</v-tooltip> </v-tooltip>
<template <span
v-else v-else
class="caption font-weight-regular"
@dblclick="showSqlClient = true"
> >
<span v-if="item.type === 'tableDir'" class="caption font-weight-regular" v-on="on">
Tables<template v-if="item.children && item.children.length"> ({{
item.children.filter(child => !search || child.name.toLowerCase().includes(search.toLowerCase())).length
}})</template></span>
<span v-else class="caption font-weight-regular" v-on="on">
{{ item.name }}</span> {{ item.name }}</span>
</template>
</v-list-item-title> </v-list-item-title>
<v-spacer /> <v-spacer />
@ -202,7 +186,6 @@
<v-list-item-group :value="selectedItem"> <v-list-item-group :value="selectedItem">
<v-list-item <v-list-item
v-for="child in item.children || []" v-for="child in item.children || []"
v-show="!search || child.name.toLowerCase().includes(search.toLowerCase())"
:key="child.key" :key="child.key"
color="x-active" color="x-active"
active-class="font-weight-bold" active-class="font-weight-bold"
@ -1785,24 +1768,6 @@ export default {
.nested:hover .action { .nested:hover .action {
opacity: 1; opacity: 1;
} }
/deep/ .nc-table-list-filter .v-input__slot {
min-height: 30px !important;
}
/deep/ .nc-table-list-filter .v-input__slot label {
top: 6px;
}
/deep/ .nc-table-list-filter.theme--light.v-text-field > .v-input__control > .v-input__slot:before {
border-top-color: rgba(0, 0, 0, 0.12) !important;
}
/deep/ .nc-table-list-filter.theme--dark.v-text-field > .v-input__control > .v-input__slot:before {
border-top-color: rgba(255, 255, 255, 0.12) !important;
}
</style> </style>
<!-- <!--

10
packages/nc-gui/components/project/spreadsheet/rowsXcDataTable.vue
Unescape View File

@ -583,7 +583,6 @@ export default {
}, },
mixins: [spreadsheet], mixins: [spreadsheet],
props: { props: {
isActive: Boolean,
tabId: String, tabId: String,
env: String, env: String,
nodes: Object, nodes: Object,
@ -671,11 +670,6 @@ export default {
rowContextMenu: null rowContextMenu: null
}), }),
watch: { watch: {
isActive(n, o) {
if (!o && n) {
this.reload()
}
},
page(p) { page(p) {
this.$store.commit('tabs/MutSetTabState', { this.$store.commit('tabs/MutSetTabState', {
id: this.uniqueId, id: this.uniqueId,
@ -1165,9 +1159,7 @@ export default {
} }
}, },
computed: { computed: {
tabsState() { tabsState() { return this.$store.state.tabs.tabsState || {} },
return this.$store.state.tabs.tabsState || {}
},
uniqueId() { uniqueId() {
return `${this.tabId}_${this.selectedViewId}` return `${this.tabId}_${this.selectedViewId}`
}, },

4
packages/nc-gui/components/project/table.vue
Unescape View File

@ -317,7 +317,6 @@
> >
<rows-xc-data-table <rows-xc-data-table
ref="tabs7" ref="tabs7"
:is-active="isActive"
:tab-id="tabId" :tab-id="tabId"
:show-tabs="relationTabs && relationTabs.length" :show-tabs="relationTabs && relationTabs.length"
:table="nodes.tn" :table="nodes.tn"
@ -385,7 +384,6 @@
<template> <template>
<rows-xc-data-table <rows-xc-data-table
ref="tabs7" ref="tabs7"
:is-active="isActive"
:show-tabs="relationTabs && relationTabs.length" :show-tabs="relationTabs && relationTabs.length"
:table="nodes.tn" :table="nodes.tn"
:nodes="nodes" :nodes="nodes"
@ -641,7 +639,7 @@ export default {
head() { head() {
return {} return {}
}, },
props: ['nodes', 'hideLogWindows', 'tabId', 'isActive'] props: ['nodes', 'hideLogWindows', 'tabId']
} }
</script> </script>

2
packages/nc-gui/components/projectTabs.vue
Unescape View File

@ -61,8 +61,8 @@
> >
<!-- <sqlLogAndOutput :hide="hideLogWindows">--> <!-- <sqlLogAndOutput :hide="hideLogWindows">-->
<TableView <TableView
v-if="activeTab === `${(tab._nodes && tab._nodes).type || ''}||${(tab._nodes && tab._nodes.dbAlias) || ''}||${tab.name}`"
:ref="'tabs'+index" :ref="'tabs'+index"
:is-active="activeTab === `${(tab._nodes && tab._nodes).type || ''}||${(tab._nodes && tab._nodes.dbAlias) || ''}||${tab.name}`"
:tab-id="`${pid}||${(tab._nodes && tab._nodes).type || ''}||${(tab._nodes && tab._nodes.dbAlias) || ''}||${tab.name}`" :tab-id="`${pid}||${(tab._nodes && tab._nodes).type || ''}||${(tab._nodes && tab._nodes.dbAlias) || ''}||${tab.name}`"
:hide-log-windows.sync="hideLogWindows" :hide-log-windows.sync="hideLogWindows"
:nodes="tab._nodes" :nodes="tab._nodes"

4
packages/nocodb/src/lib/noco/meta/NcMetaMgr.ts
Unescape View File

@ -4568,9 +4568,7 @@ export default class NcMetaMgr {
result[d.title].disabled[d.role] = !!d.disabled; result[d.title].disabled[d.role] = !!d.disabled;
} }
return Object.values(result)?.sort((a: any, b: any) => return Object.values(result);
(a?._tn || a?.tn)?.localeCompare(b?._tn || b?.tn)
);
} }
break; break;
case 'view': case 'view':

Write Preview
Loading…
Cancel
Save