diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue index 33cbf360e9..4a805a9441 100644 --- a/packages/nc-gui/components/smartsheet/Kanban.vue +++ b/packages/nc-gui/components/smartsheet/Kanban.vue @@ -12,6 +12,7 @@ import { IsPublicInj, MetaInj, OpenNewRecordFormHookInj, + ReadonlyInj, inject, onBeforeMount, onBeforeUnmount, @@ -84,6 +85,8 @@ provide(IsGridInj, ref(false)) provide(IsKanbanInj, ref(true)) +provide(ReadonlyInj, !isUIAllowed('xcDatatableEditable')) + const hasEditPermission = $computed(() => isUIAllowed('xcDatatableEditable')) const fields = inject(FieldsInj, ref([])) diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue index f2552013a4..089496bf00 100644 --- a/packages/nc-gui/components/smartsheet/Map.vue +++ b/packages/nc-gui/components/smartsheet/Map.vue @@ -7,23 +7,28 @@ import { IsFormInj, IsGalleryInj, IsGridInj, IsMapInj, ReadonlyInj, onMounted, p const { isUIAllowed } = useUIPermission() -provide(IsFormInj, ref(false)) +// provide(IsFormInj, ref(false)) provide(IsGalleryInj, ref(false)) provide(IsGridInj, ref(false)) provide(IsMapInj, ref(true)) provide(ReadonlyInj, !isUIAllowed('xcDatatableEditable')) -const reloadViewDataHook = inject(ReloadViewDataHookInj) + + // const meta = inject(MetaInj, ref()) // const view = inject(ActiveViewInj, ref()) const view = inject(ActiveViewInj, ref()) const meta = inject(MetaInj, ref()) -const { formattedData, loadMapData, mapData } = useMapViewStoreOrThrow() +const reloadViewDataHook = inject(ReloadViewDataHookInj) + +// const reloadViewMetaHook = inject(ReloadViewMetaHookInj) +const { formattedData, loadMapData, loadMapMeta, mapMetaData } = useMapViewStoreOrThrow() // const { loadData, formattedData: data } = useViewData(meta, view) // const { sharedView, sorts, nestedFilters } = useSharedView() + const { showSystemFields, // sortedAndFilteredFields, @@ -58,8 +63,10 @@ const markersRef = ref() // const { isUIAllowed } = useUIPermission() -onMounted(async () => { +onBeforeMount(async () => { await loadMapData() + await loadMapMeta() + console.log('on mapview mapMetaData', mapMetaData) // const geodata = data.value[0].row.geo.split(';') }) @@ -71,10 +78,15 @@ onMounted(async () => { // ), // ) +const { fk_geo_data_col_id } = mapMetaData.value + +console.log('fk_geo_data_col_id', fk_geo_data_col_id) + watch(formattedData, () => { markersRef.value?.clearLayers() - console.log('mapData', mapData?.value?.fk_geo_data_col_id) + console.log('mapMetaData', mapMetaData?.value?.fk_geo_data_col_id) formattedData.value?.forEach((row) => { + console.log('fk_geo_data_col_id', fk_geo_data_col_id) // const [lat, long] = console.log('meta', meta?.value?.columns) console.log('row', row) @@ -125,7 +137,7 @@ onMounted(async () => {