From db12ffcee6a75f24855450956c3acf113f1fc0fb Mon Sep 17 00:00:00 2001 From: dataeaseShu <tong.shu@fit2cloud.com> Date: Tue, 7 May 2024 14:53:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E8=AE=BE=E7=BD=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=BC=96=E8=BE=91=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=B8=8D=E6=98=8E=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v-query/QueryConditionConfiguration.vue | 29 ++++++++++++++++--- .../src/custom-component/v-query/Select.vue | 2 +- 2 files changed, 26 insertions(+), 5 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 c2fbe13b36..c3ef353379 100644 --- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue +++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue @@ -1348,9 +1348,11 @@ defineExpose({ </el-tree-select> </div> <div class="value"> + <span class="label">查询字段</span> <el-select @change="handleFieldChange" placeholder="查询字段" + class="search-field" v-model="curComponent.field.id" > <template v-if="curComponent.field.id" #prefix> @@ -1394,7 +1396,12 @@ defineExpose({ </el-select> </div> <div class="value"> - <el-select placeholder="显示字段" v-model="curComponent.displayId"> + <span class="label">显示字段</span> + <el-select + placeholder="显示字段" + class="search-field" + v-model="curComponent.displayId" + > <template v-if="curComponent.displayId" #prefix> <el-icon> <Icon @@ -1440,6 +1447,7 @@ defineExpose({ </el-select> </div> <div class="value"> + <span class="label">排序字段</span> <el-select clearable placeholder="请选择排序字段" @@ -2223,15 +2231,28 @@ defineExpose({ } .value { + .ed-select { + width: 321px; + } width: 321px; .value { margin-top: 8px; &:first-child { margin-top: -0.5px; } - } - .ed-select { - width: 321px; + .search-field { + width: 257px; + } + + .sort-field { + width: 176px; + } + + .label { + line-height: 32px; + font-size: 14px; + margin-right: 8px; + } } } diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue index 587aee10de..907e671af8 100644 --- a/core/core-frontend/src/custom-component/v-query/Select.vue +++ b/core/core-frontend/src/custom-component/v-query/Select.vue @@ -174,7 +174,7 @@ const handleFieldIdChange = (val: EnumValue) => { const mapValue = setDefaultMapValue( Array.isArray(selectValue.value) ? [...selectValue.value] : [selectValue.value] ) - if (mapValue.length !== config.value.defaultMapValue.length) { + if (mapValue?.length !== config.value.defaultMapValue?.length) { shouldReSearch = true } else if (!mapValue.every(value => config.value.defaultMapValue.includes(value))) { shouldReSearch = true