diff --git a/src/components/common/preview/index.vue b/src/components/common/preview/index.vue index fce034ed..58136ea3 100644 --- a/src/components/common/preview/index.vue +++ b/src/components/common/preview/index.vue @@ -14,6 +14,7 @@ import { get_cookie, set_cookie, get_math } from '@/utils'; import { commonStore } from '@/store'; import { get_type } from '@/utils/common'; +import { isEmpty } from 'lodash'; const common_store = commonStore(); const props = defineProps({ dataId: { @@ -53,10 +54,7 @@ watch( set_cookie('uuid_name', uuid_val); } let url = common_store.common.config.preview_url; - if (url == '') { - ElMessage.error('请先配置预览地址'); - dialog_visible.value = false; - } else { + if (!isEmpty(url)) { // 判断是否包含? 如果包含?的话就是添加参数,否则就是添加?后添加参数 new_link.value = url + (url.includes('?') ? '&id=' : '?id=') + props.dataId + '&system_type=default' + token.value + '&uuid=' + uuid_val; } diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue index 318a3cda..bcaf7768 100644 --- a/src/views/layout/index.vue +++ b/src/views/layout/index.vue @@ -268,8 +268,13 @@ const loading_event = () => { const preview_dialog = ref(false); const diy_id = ref(''); const preview_event = (bool: boolean) => { - save_disabled.value = bool; - save_formmat_form_data(form.value, false, false, true); + let url = common_store.common.config.preview_url; + if (isEmpty(url)) { + ElMessage.error('请先配置预览地址'); + } else { + save_disabled.value = bool; + save_formmat_form_data(form.value, false, false, true); + } }; const save_disabled = ref(false); const save_event = (bool: boolean) => {