diff --git a/packages/nc-gui-v2/.eslintrc.js b/packages/nc-gui-v2/.eslintrc.js index ffce177519..140e59ec6a 100644 --- a/packages/nc-gui-v2/.eslintrc.js +++ b/packages/nc-gui-v2/.eslintrc.js @@ -9,4 +9,5 @@ module.exports = { extends: ['@antfu', 'plugin:prettier/recommended'], plugins: ['prettier'], rules: baseRules, + ignorePatterns: ['!*.d.ts'], } diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue index 812e5cc107..d56cfb3174 100644 --- a/packages/nc-gui-v2/app.vue +++ b/packages/nc-gui-v2/app.vue @@ -3,35 +3,35 @@ import MdiAt from '~icons/mdi/at' import MdiLogout from '~icons/mdi/logout' import MdiDotsVertical from '~icons/mdi/dots-vertical' import MaterialSymbolsMenu from '~icons/material-symbols/menu' +import MdiReload from '~icons/mdi/reload' import { navigateTo } from '#app' +import { useGlobal } from '#imports' -const { $state } = useNuxtApp() +const state = useGlobal() const sidebar = ref() -const email = computed(() => $state.user?.value?.email ?? '---') +const email = computed(() => state.user.value?.email ?? '---') const signOut = () => { - $state.signOut() + state.signOut() navigateTo('/signin') } -const toggleSidebar = useToggle($state.sidebarOpen) - -const sidebarOpen = computed({ - get: () => !$state.sidebarOpen.value, - set: (val) => toggleSidebar(val), +const sidebarCollapsed = computed({ + get: () => !state.sidebarOpen.value, + set: (val) => (state.sidebarOpen.value = !val), }) + +const toggleSidebar = () => { + sidebarCollapsed.value = !sidebarCollapsed.value +} diff --git a/packages/nc-gui-v2/components/dashboard/TabView.vue b/packages/nc-gui-v2/components/dashboard/TabView.vue deleted file mode 100644 index ebcb842020..0000000000 --- a/packages/nc-gui-v2/components/dashboard/TabView.vue +++ /dev/null @@ -1,149 +0,0 @@ - - - - - diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue index de0a0c305a..2b6b2b2b8b 100644 --- a/packages/nc-gui-v2/components/dashboard/TreeView.vue +++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue @@ -1,15 +1,14 @@ + + - + + + + + + + + + diff --git a/packages/nc-gui-v2/components/dlg/ViewDelete.vue b/packages/nc-gui-v2/components/dlg/ViewDelete.vue new file mode 100644 index 0000000000..1aefbaabc7 --- /dev/null +++ b/packages/nc-gui-v2/components/dlg/ViewDelete.vue @@ -0,0 +1,68 @@ + + + diff --git a/packages/nc-gui-v2/components/general/FlippingCard.vue b/packages/nc-gui-v2/components/general/FlippingCard.vue new file mode 100644 index 0000000000..21b72fe0f8 --- /dev/null +++ b/packages/nc-gui-v2/components/general/FlippingCard.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/packages/nc-gui-v2/components/general/Share.vue b/packages/nc-gui-v2/components/general/Share.vue index a48cd29a38..dfb908e93f 100644 --- a/packages/nc-gui-v2/components/general/Share.vue +++ b/packages/nc-gui-v2/components/general/Share.vue @@ -3,7 +3,7 @@ interface Props { url: string socialMedias: string[] title?: string - summary: string + summary?: string hashTags?: string css?: string iconClass?: string diff --git a/packages/nc-gui-v2/components/general/Social.vue b/packages/nc-gui-v2/components/general/Social.vue index 509e723a98..87613759c2 100644 --- a/packages/nc-gui-v2/components/general/Social.vue +++ b/packages/nc-gui-v2/components/general/Social.vue @@ -15,33 +15,30 @@ const isZhLang = $computed(() => locale.value.startsWith('zh')) diff --git a/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue new file mode 100644 index 0000000000..043982561c --- /dev/null +++ b/packages/nc-gui-v2/components/smartsheet-column/AdvancedOptions.vue @@ -0,0 +1,94 @@ + + + + + diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue new file mode 100644 index 0000000000..1481f6294a --- /dev/null +++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue index 6db3a86053..4171e6b974 100644 --- a/packages/nc-gui-v2/components/smartsheet-header/Cell.vue +++ b/packages/nc-gui-v2/components/smartsheet-header/Cell.vue @@ -1,9 +1,16 @@ diff --git a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue index 93fb9456b2..bdb134c499 100644 --- a/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue +++ b/packages/nc-gui-v2/components/smartsheet-header/CellIcon.vue @@ -1,7 +1,7 @@ + + diff --git a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue index 6cd3dadd3d..003d7c4832 100644 --- a/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue +++ b/packages/nc-gui-v2/components/smartsheet-header/VirtualCell.vue @@ -1,6 +1,6 @@ + + - +
+ +
+
+ diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue index 28e10616db..5332e17d78 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/ColumnFilter.vue @@ -1,11 +1,11 @@ + + - +
+ +
+
+ diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue index 4f9215170d..fc947db923 100644 --- a/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue +++ b/packages/nc-gui-v2/components/smartsheet-toolbar/FieldsMenu.vue @@ -1,8 +1,10 @@ - -