Commit 4794f8a3 authored by nick zheng's avatar nick zheng

Merge branch 'beta' into 'master'

Beta

See merge request !64
parents d3157a29 828be4d6
......@@ -2,7 +2,7 @@
import { computed, h, ref, watchEffect } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { Plus, Logout, Me } from '@icon-park/vue-next'
import { Plus, Me } from '@icon-park/vue-next'
import type { MenuOption } from 'naive-ui'
import { useUserStore } from '@/store/modules/user'
// import LanguageSetting from '@/components/language-setting/language-setting.vue'
......@@ -52,11 +52,11 @@ const userConfigOptions = computed(() => {
key: 'PersonalSettings',
icon: () => h(Me, { theme: 'outline', size: 14, strokeWidth: 3 }),
},
{
label: () => h('div', t('common_module.logout')),
key: 'Logout',
icon: () => h(Logout, { theme: 'outline', size: 14, strokeWidth: 3 }),
},
// {
// label: () => h('div', t('common_module.logout')),
// key: 'Logout',
// icon: () => h(Logout, { theme: 'outline', size: 14, strokeWidth: 3 }),
// },
]
})
......
......@@ -3,7 +3,6 @@ import { reactive } from 'vue'
import { useRouter } from 'vue-router'
import { useI18n } from 'vue-i18n'
import { createChannelPublishColumn } from '../columns'
import { INDEX_URLS } from '@/config/base-url'
import useTableScrollY from '@/composables/useTableScrollY'
import { copyToClip } from '@/utils/copy'
......@@ -33,12 +32,12 @@ function handleClickChannelPublishTableAction(actionType: string) {
}
function handleAccessPage() {
const channelUrl = `${INDEX_URLS[window.ENV || 'DEV']}share/web_source/${router.currentRoute.value.params.agentId}`
const channelUrl = `${window.location.origin}/fe/share/web_source/${router.currentRoute.value.params.agentId}`
location.href = channelUrl
}
function handleCopyShareLink() {
const channelUrl = `${INDEX_URLS[window.ENV || 'DEV']}share/web_source/${router.currentRoute.value.params.agentId}`
const channelUrl = `${window.location.origin}/fe/share/web_source/${router.currentRoute.value.params.agentId}`
copyToClip(channelUrl)
window.$message.success(
t('personal_space_module.agent_module.agent_setting_module.agent_publish_module.copy_share_url_success_message'),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment