test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: custom dropdown doesn't redirect also settings become dirty issue

Browse Source
This commit is contained in:
Shariq Ansari 2024-12-30 15:34:39 +05:30
parent 3c7454d5c7
commit 1622ce3d5f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/src/components/UserDropdown.vue
View File

@ -20,7 +20,9 @@
: 'ml-2 w-auto opacity-100' : 'ml-2 w-auto opacity-100'
" "
> >
<div class="text-base font-medium leading-none text-ink-gray-9 truncate"> <div
class="text-base font-medium leading-none text-ink-gray-9 truncate"
>
{{ __(brand.name || 'CRM') }} {{ __(brand.name || 'CRM') }}
</div> </div>
<div class="mt-1 text-sm leading-none text-ink-gray-7 truncate"> <div class="mt-1 text-sm leading-none text-ink-gray-7 truncate">
@ -55,7 +57,7 @@ import { getSettings } from '@/stores/settings'
import { showSettings } from '@/composables/settings' import { showSettings } from '@/composables/settings'
import { Dropdown } from 'frappe-ui' import { Dropdown } from 'frappe-ui'
import { useStorage } from '@vueuse/core' import { useStorage } from '@vueuse/core'
import { computed, markRaw, onMounted } from 'vue' import { computed, h, markRaw, onMounted } from 'vue'
const props = defineProps({ const props = defineProps({
isCollapsed: { isCollapsed: {
@ -104,22 +106,22 @@ const dropdownItems = computed(() => {
}) })
function dropdownItemObj(item) { function dropdownItemObj(item) {
let openInNewWindow = item.open_in_new_window let _item = JSON.parse(JSON.stringify(item))
let icon = _item.icon || 'external-link'
let icon = item.icon || 'external-link'
if (typeof icon === 'string' && icon.startsWith('<svg')) { if (typeof icon === 'string' && icon.startsWith('<svg')) {
icon = markRaw({ template: icon }) icon = markRaw(h('div', { innerHTML: icon }))
} }
item.icon = icon _item.icon = icon
if (item.is_standard) { if (_item.is_standard) {
return getStandardItem(item) return getStandardItem(_item)
} }
return { return {
icon: item.icon, icon: _item.icon,
label: __(item.label), label: __(_item.label),
onClick: () => window.open(item.url, openInNewWindow ? '_blank' : ''), onClick: () =>
window.open(_item.route, _item.open_in_new_window ? '_blank' : ''),
} }
} }
@ -133,13 +135,15 @@ function getStandardItem(item) {
return { return {
icon: item.icon, icon: item.icon,
label: __(item.label), label: __(item.label),
onClick: () => window.open(item.route, '_blank'), onClick: () =>
window.open(item.route, item.open_in_new_window ? '_blank' : ''),
} }
case 'docs_link': case 'docs_link':
return { return {
icon: item.icon, icon: item.icon,
label: __(item.label), label: __(item.label),
onClick: () => window.open(item.route, '_blank'), onClick: () =>
window.open(item.route, item.open_in_new_window ? '_blank' : ''),
} }
case 'toggle_theme': case 'toggle_theme':
return { return {