Browse Source

Revert "geodata easter egg: debugging weird template reactivity issue for the bottom menu"

This reverts commit 3f7db98c55.
pull/4723/head
flisowna 2 years ago
parent
commit
ca9d3889b4
  1. 62
      packages/nc-gui/components/smartsheet/sidebar/MenuBottom.vue
  2. 2
      packages/nc-gui/components/smartsheet/sidebar/toolbar/GeodataSwitcher.vue
  3. 4
      packages/nc-gui/composables/useMapViewDataStore.ts

62
packages/nc-gui/components/smartsheet/sidebar/MenuBottom.vue

@ -22,48 +22,38 @@ function onOpenModal(type: ViewTypes, title = '') {
$e('c:view:create', { view: type }) $e('c:view:create', { view: type })
emits('openModal', { type, title }) emits('openModal', { type, title })
} }
const BAR = ref(true)
setInterval(() => {
// alert('jo')
BAR.value = !BAR.value
}, 2000)
</script> </script>
<template> <template>
{{ geodataToggleState.show }}
<a-menu :selected-keys="[]" class="flex flex-col"> <a-menu :selected-keys="[]" class="flex flex-col">
<div> <div>
<h3 class="px-3 text-xs font-semibold flex items-center gap-4 text-gray-500"> <h3 class="px-3 text-xs font-semibold flex items-center gap-4 text-gray-500">
{{ $t('activity.createView') }} {{ $t('activity.createView') }}
</h3> </h3>
<!-- <div v-if="BAR"> --> <a-menu-item
BAR IS TRUE key="grid"
<a-menu-item class="group !flex !items-center !my-0 !h-2.5rem nc-create-grid-view"
v-if="BAR" @click="onOpenModal(ViewTypes.GRID)"
key="grid" >
class="group !flex !items-center !my-0 !h-2.5rem nc-create-grid-view" <a-tooltip :mouse-enter-delay="1" placement="left">
@click="onOpenModal(ViewTypes.GRID)" <template #title>
>GRID BAR {{ $t('msg.info.addView.grid') }}
<div v-if="BAR">BAR IS TRUE</div> </template>
<a-tooltip :mouse-enter-delay="1" placement="left">
<template #title> <div class="nc-project-menu-item !py-0 text-xs flex items-center h-full w-full gap-2">
{{ $t('msg.info.addView.grid') }} <component :is="viewIcons[ViewTypes.GRID].icon" :style="{ color: viewIcons[ViewTypes.GRID].color }" />
</template>
<div>{{ $t('objects.viewType.grid') }}</div>
<div class="nc-project-menu-item !py-0 text-xs flex items-center h-full w-full gap-2">
<component :is="viewIcons[ViewTypes.GRID].icon" :style="{ color: viewIcons[ViewTypes.GRID].color }" /> <div class="flex-1" />
<div>{{ $t('objects.viewType.grid') }}</div> <mdi-plus class="group-hover:text-primary" />
</div>
<div class="flex-1" /> </a-tooltip>
</a-menu-item>
<mdi-plus class="group-hover:text-primary" />
</div>
</a-tooltip>
</a-menu-item>
<!-- </div> -->
<a-menu-item <a-menu-item
key="gallery" key="gallery"
class="group !flex !items-center !my-0 !h-2.5rem nc-create-gallery-view" class="group !flex !items-center !my-0 !h-2.5rem nc-create-gallery-view"
@ -87,6 +77,7 @@ setInterval(() => {
</a-menu-item> </a-menu-item>
<a-menu-item <a-menu-item
v-if="!isSqlView"
key="form" key="form"
class="group !flex !items-center !my-0 !h-2.5rem nc-create-form-view" class="group !flex !items-center !my-0 !h-2.5rem nc-create-form-view"
@click="onOpenModal(ViewTypes.FORM)" @click="onOpenModal(ViewTypes.FORM)"
@ -107,6 +98,7 @@ setInterval(() => {
</div> </div>
</a-tooltip> </a-tooltip>
</a-menu-item> </a-menu-item>
<a-menu-item <a-menu-item
key="kanban" key="kanban"
class="group !flex !items-center !my-0 !h-2.5rem nc-create-kanban-view" class="group !flex !items-center !my-0 !h-2.5rem nc-create-kanban-view"
@ -128,13 +120,13 @@ setInterval(() => {
</div> </div>
</a-tooltip> </a-tooltip>
</a-menu-item> </a-menu-item>
<div v-if="geodataToggleState.show">SHOW</div>
<a-menu-item <a-menu-item
key="map" key="map"
class="group !flex !items-center !my-0 !h-2.5rem nc-create-map-view" class="group !flex !items-center !my-0 !h-2.5rem nc-create-map-view"
@click="onOpenModal(ViewTypes.MAP)" @click="onOpenModal(ViewTypes.MAP)"
> >
<div id="FOO">FOO: {{ geodataToggleState }}</div> {{ geodataToggleState.show }}
<a-tooltip :mouse-enter-delay="1" placement="left"> <a-tooltip :mouse-enter-delay="1" placement="left">
<template #title> <template #title>

2
packages/nc-gui/components/smartsheet/sidebar/toolbar/GeodataSwitcher.vue

@ -12,7 +12,7 @@ import { IsGeodataActiveInj, ReadonlyInj, useGlobal } from '#imports'
// provide(ReadonlyInj, GeoDataToggleRef) // provide(ReadonlyInj, GeoDataToggleRef)
async function toggleGeodataFeature() { async function toggleGeodataFeature() {
geodataToggleState.value = !geodataToggleState.value geodataToggleState.show = !geodataToggleState.show
// console.log(GeoDataToggleRef.value) // console.log(GeoDataToggleRef.value)
} }

4
packages/nc-gui/composables/useMapViewDataStore.ts

@ -1,10 +1,10 @@
import { reactive } from 'vue';
import type { ComputedRef, Ref } from 'vue' import type { ComputedRef, Ref } from 'vue'
import type { ColumnType, MapType, TableType, ViewType } from 'nocodb-sdk' import type { ColumnType, MapType, TableType, ViewType } from 'nocodb-sdk'
import { ref, useInjectionState, useMetas } from '#imports' import { ref, useInjectionState, useMetas } from '#imports'
import type { Row } from '~/lib' import type { Row } from '~/lib'
// export const geodataToggleState = reactive({ show: false }) export const geodataToggleState = reactive({ show: false })
export const geodataToggleState = ref(false)
const formatData = (list: Row[]) => const formatData = (list: Row[]) =>
list.map((row) => ({ list.map((row) => ({

Loading…
Cancel
Save