From 2378c6ad98e7eb7c9508de478b93463ed0f0dbb6 Mon Sep 17 00:00:00 2001 From: dataeaseShu Date: Thu, 29 Aug 2024 15:34:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E4=BD=93=EF=BC=8C=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BE=93=E5=85=A5=E7=A9=BA=E6=A0=BC=E6=88=96?= =?UTF-8?q?=E5=88=B6=E8=A1=A8=E7=AC=A6=EF=BC=8C=E5=8F=AF=E4=BB=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E4=BD=93=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/QueryConditionConfiguration.vue | 5 +++-- .../editor/filter/auth-tree/FilterFiled.vue | 19 ++++++++++++------- .../src/views/system/font/UploadDetail.vue | 16 ++++++++++++++-- .../src/views/system/font/index.vue | 6 ++---- 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue index 4598a0f6c5..e410833713 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -333,8 +333,9 @@ const setType = () => { if (field?.deType === 7) { curComponent.value.displayType = '0' } + if ( - displayType !== curComponent.value.displayType && + +displayType !== +curComponent.value.displayType && !([3, 4].includes(+displayType) && +curComponent.value.displayType === 2) ) { setTypeChange() @@ -807,7 +808,7 @@ const validate = () => { } if (ele.displayType !== '9' && ele.optionValueSource === 1 && !ele.field.id) { - ElMessage.error('请选择数据集的选项值字段') + ElMessage.error(!ele.dataset?.id ? '请选择数据集及选项值字段' : '请选择数据集的选项值字段') return true } diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue index 2aa3646568..d989212399 100644 --- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue +++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree/FilterFiled.vue @@ -476,14 +476,19 @@ const emits = defineEmits(['update:item', 'del'])
diff --git a/core/core-frontend/src/views/system/font/UploadDetail.vue b/core/core-frontend/src/views/system/font/UploadDetail.vue index 1a7357b5b7..b6010c70be 100644 --- a/core/core-frontend/src/views/system/font/UploadDetail.vue +++ b/core/core-frontend/src/views/system/font/UploadDetail.vue @@ -73,8 +73,17 @@ defineExpose({ init }) +const beforeAvatarUpload = rawFile => { + if (rawFile.type !== 'font/ttf') { + ElMessage.error('只支持上传ttf格式的字体文件!') + return false + } + return true +} const onChange = file => { - state.fileList = file + if (file.raw?.type === 'font/ttf') { + state.fileList = file + } } const uploadFail = response => { @@ -110,6 +119,7 @@ const confirm = () => {