Browse Source

fix(nc-gui): defer loading flow component until modal transition has ended

pull/3612/head
braks 2 years ago committed by Muhammed Mustafa
parent
commit
3de0b2e68f
  1. 6
      packages/nc-gui/components/erd/SimpleView.vue
  2. 5
      packages/nc-gui/components/erd/View.vue

6
packages/nc-gui/components/erd/SimpleView.vue

@ -24,9 +24,8 @@ const { metasWithIdAsKey } = useMetas()
const { $destroy, fitView } = useVueFlow() const { $destroy, fitView } = useVueFlow()
const { $destroy, fitView } = useVueFlow()
const isTransitioning = ref(true) const isTransitioning = ref(true)
const nodes = ref<Node[]>([]) const nodes = ref<Node[]>([])
const edges = ref<Edge[]>([]) const edges = ref<Edge[]>([])
@ -187,6 +186,7 @@ const init = (reset = false) => {
populateInitialNodes() populateInitialNodes()
populateEdges() populateEdges()
layoutNodes() layoutNodes()
if (reset) { if (reset) {
setTimeout(() => fitView({ duration: 300 })) setTimeout(() => fitView({ duration: 300 }))
} }
@ -222,7 +222,7 @@ useEventListener('transitionend', () => {
<div <div
v-if="!config.singleTableMode" v-if="!config.singleTableMode"
class="absolute bottom-0 right-0 flex flex-col text-xs bg-white px-2 py-1 border-1 rounded-md border-gray-200 z-50 nc-erd-histogram" class="absolute bottom-0 right-0 flex flex-col text-xs bg-white px-2 py-1 border-1 rounded-md border-gray-200"
style="font-size: 0.6rem" style="font-size: 0.6rem"
> >
<div class="flex flex-row items-center space-x-1 border-b-1 pb-1 border-gray-100"> <div class="flex flex-row items-center space-x-1 border-b-1 pb-1 border-gray-100">

5
packages/nc-gui/components/erd/View.vue

@ -118,8 +118,9 @@ watch(
class="ml-2 select-none nc-erd-showColumns-label" class="ml-2 select-none nc-erd-showColumns-label"
style="font-size: 0.65rem" style="font-size: 0.65rem"
@dblclick="showAdvancedOptions = true" @dblclick="showAdvancedOptions = true"
>{{ $t('activity.erd.showColumns') }}</span >
> {{ $t('activity.erd.showColumns') }}
</span>
</div> </div>
<div class="flex flex-row items-center"> <div class="flex flex-row items-center">
<a-checkbox <a-checkbox

Loading…
Cancel
Save