Browse Source

fix: Fixed kanban duplicate issue

pull/6888/head
Muhammed Mustafa 1 year ago
parent
commit
35df7e7cdb
  1. 2
      packages/nc-gui/components/dlg/ViewCreate.vue
  2. 10
      packages/nc-gui/components/smartsheet/toolbar/OpenedViewAction.vue

2
packages/nc-gui/components/dlg/ViewCreate.vue

@ -308,7 +308,7 @@ onMounted(async () => {
<NcSelect <NcSelect
v-model:value="form.fk_grp_col_id" v-model:value="form.fk_grp_col_id"
class="w-full nc-kanban-grouping-field-select" class="w-full nc-kanban-grouping-field-select"
:disabled="groupingFieldColumnId || isMetaLoading" :disabled="isMetaLoading"
:loading="isMetaLoading" :loading="isMetaLoading"
:options="viewSelectFieldOptions" :options="viewSelectFieldOptions"
:placeholder="$t('placeholder.selectGroupField')" :placeholder="$t('placeholder.selectGroupField')"

10
packages/nc-gui/components/smartsheet/toolbar/OpenedViewAction.vue

@ -20,7 +20,7 @@ const { t } = useI18n()
const { $api, $e } = useNuxtApp() const { $api, $e } = useNuxtApp()
const isOpen = ref(false) const isDropdownOpen = ref(false)
const isPublicView = inject(IsPublicInj, ref(false)) const isPublicView = inject(IsPublicInj, ref(false))
@ -77,6 +77,7 @@ const onViewIdCopy = async () => {
/** Duplicate a view */ /** Duplicate a view */
// todo: This is not really a duplication, maybe we need to implement a true duplication? // todo: This is not really a duplication, maybe we need to implement a true duplication?
function onDuplicate() { function onDuplicate() {
isDropdownOpen.value = false
const isOpen = ref(true) const isOpen = ref(true)
const { close } = useDialog(resolveComponent('DlgViewCreate'), { const { close } = useDialog(resolveComponent('DlgViewCreate'), {
@ -85,6 +86,7 @@ function onDuplicate() {
'type': activeView.value!.type as ViewTypes, 'type': activeView.value!.type as ViewTypes,
'tableId': activeTable.value!.id, 'tableId': activeTable.value!.id,
'selectedViewId': activeView.value!.id, 'selectedViewId': activeView.value!.id,
'groupingFieldColumnId': activeView.value!.view!.fk_grp_col_id,
'views': views, 'views': views,
'onUpdate:modelValue': closeDialog, 'onUpdate:modelValue': closeDialog,
'onCreated': async (view: ViewType) => { 'onCreated': async (view: ViewType) => {
@ -115,7 +117,7 @@ function onDuplicate() {
} }
} }
watch(isOpen, () => { watch(isDropdownOpen, () => {
setTimeout(() => { setTimeout(() => {
isViewIdCopied.value = false isViewIdCopied.value = false
}, 250) }, 250)
@ -123,7 +125,7 @@ watch(isOpen, () => {
</script> </script>
<template> <template>
<NcDropdown v-model:visible="isOpen"> <NcDropdown v-model:visible="isDropdownOpen">
<div <div
class="truncate nc-active-view-title !hover:(bg-gray-100 text-gray-800) ml-0.25 pl-1 pr-0.25 rounded-md py-1 cursor-pointer" class="truncate nc-active-view-title !hover:(bg-gray-100 text-gray-800) ml-0.25 pl-1 pr-0.25 rounded-md py-1 cursor-pointer"
:class="{ :class="{
@ -232,7 +234,7 @@ watch(isOpen, () => {
</template> </template>
<template #expandIcon></template> <template #expandIcon></template>
<div class="flex py-3 px-4 font-semibold uppercase text-xs text-gray-500">View Settings</div> <div class="flex py-3 px-4 font-bold uppercase text-xs text-gray-500">View Settings</div>
<NcMenuItem class="nc-view-action-lock-subaction" @click="changeLockType(LockType.Collaborative)"> <NcMenuItem class="nc-view-action-lock-subaction" @click="changeLockType(LockType.Collaborative)">
<LazySmartsheetToolbarLockType :type="LockType.Collaborative" /> <LazySmartsheetToolbarLockType :type="LockType.Collaborative" />
</NcMenuItem> </NcMenuItem>

Loading…
Cancel
Save