diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss index 21336be98a..410781cf29 100644 --- a/packages/nc-gui-v2/assets/style-v2.scss +++ b/packages/nc-gui-v2/assets/style-v2.scss @@ -64,3 +64,8 @@ h1, h2, h3, h4, h5, h6, p, label, button, textarea, select { html { overflow-y: auto !important; } + + +.nc-menu-item { + @apply cursor-pointer text-xs flex align-center gap-2 p-4 relative after:(content-[''] absolute top-0 left-0 w-full h-full right 0 bg-current opacity-0 transition transition-opactity duration-100) hover:(after:(opacity-5)); +} diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 9f33de26f3..0aeedc3574 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -7,6 +7,7 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { + AAlert: typeof import('ant-design-vue/es')['Alert'] AAnchorLink: typeof import('ant-design-vue/es')['AnchorLink'] AAutoComplete: typeof import('ant-design-vue/es')['AutoComplete'] AButton: typeof import('ant-design-vue/es')['Button'] diff --git a/packages/nc-gui-v2/components/cell/TextArea.vue b/packages/nc-gui-v2/components/cell/TextArea.vue index c61427d171..d27590877d 100644 --- a/packages/nc-gui-v2/components/cell/TextArea.vue +++ b/packages/nc-gui-v2/components/cell/TextArea.vue @@ -2,7 +2,7 @@ import { computed, inject, onMounted, ref } from '#imports' interface Props { - modelValue: string + modelValue?: string } const { modelValue: value } = defineProps() diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue index ab122869b1..55cc4bd111 100644 --- a/packages/nc-gui-v2/components/dashboard/TreeView.vue +++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue @@ -192,7 +192,7 @@ const reloadTables = async () => { } const addTableTab = (table: TableType) => { $e('a:table:open') - addTab({ title: table.title, id: table.id }) + addTab({ title: table.title, id: table.id, type: table.type as any }) } @@ -208,7 +208,7 @@ const addTableTab = (table: TableType) => { -
+
{ {{ $t('objects.tables') }} - + { diff --git a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue index a11e763013..45a109f5fe 100644 --- a/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue +++ b/packages/nc-gui-v2/components/dashboard/settings/AuditTab.vue @@ -96,6 +96,6 @@ const columns = [ />
- +
diff --git a/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue new file mode 100644 index 0000000000..54bbb68ebb --- /dev/null +++ b/packages/nc-gui-v2/components/dashboard/settings/Metadata.vue @@ -0,0 +1,112 @@ + + + diff --git a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue index ddc82ef0cc..b3eb076fa7 100644 --- a/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue +++ b/packages/nc-gui-v2/components/dashboard/settings/SettingsModal.vue @@ -2,6 +2,8 @@ import type { FunctionalComponent, SVGAttributes } from 'vue' import AuditTab from './AuditTab.vue' import AppStore from './AppStore.vue' +import Metadata from './Metadata.vue' +import UIAcl from './UIAcl.vue' import StoreFrontOutline from '~icons/mdi/storefront-outline' import TeamFillIcon from '~icons/ri/team-fill' import MultipleTableIcon from '~icons/mdi/table-multiple' @@ -61,11 +63,11 @@ const tabsInfo: TabGroup = { subTabs: { metaData: { title: 'Metadata', - body: () => AuditTab, + body: () => Metadata, }, acl: { title: 'UI Access Control', - body: () => AuditTab, + body: () => UIAcl, }, }, }, diff --git a/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue new file mode 100644 index 0000000000..53dc342609 --- /dev/null +++ b/packages/nc-gui-v2/components/dashboard/settings/UIAcl.vue @@ -0,0 +1,140 @@ + + + diff --git a/packages/nc-gui-v2/components/dlg/AirtableImport.vue b/packages/nc-gui-v2/components/dlg/AirtableImport.vue index 972aa300bb..28c808e539 100644 --- a/packages/nc-gui-v2/components/dlg/AirtableImport.vue +++ b/packages/nc-gui-v2/components/dlg/AirtableImport.vue @@ -210,7 +210,7 @@ onBeforeUnmount(() => {