From 9259c2235e31708f954a3578bde3c6a7ab9753e8 Mon Sep 17 00:00:00 2001 From: houzhongjian <houzhongyi@126.com> Date: 星期一, 30 十二月 2024 15:51:40 +0800 Subject: [PATCH] 1、工作流相关组件更新 2、偶尔出现退出登录时路由报错的bug导致无法回到登录页面 3、全局配置文件修改,移除VITE_UPLOAD_URL配置等 --- src/components/Icon/src/IconSelect.vue | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue index d4a5b07..76cc6d5 100644 --- a/src/components/Icon/src/IconSelect.vue +++ b/src/components/Icon/src/IconSelect.vue @@ -11,6 +11,10 @@ modelValue: { require: false, type: String + }, + clearable: { + require: false, + type: Boolean } }) const emit = defineEmits<{ (e: 'update:modelValue', v: string) }>() @@ -92,6 +96,12 @@ currentPage.value = page } +function clearIcon() { + icon.value = '' + emit('update:modelValue', '') + visible.value = false +} + watch( () => { return props.modelValue @@ -115,14 +125,14 @@ <template> <div class="selector"> - <ElInput v-model="inputValue" @click="visible = !visible"> + <ElInput v-model="inputValue" @click="visible = !visible" :clearable="props.clearable" @clear="clearIcon"> <template #append> <ElPopover :popper-options="{ placement: 'auto' }" :visible="visible" - :width="350" + :width="355" popper-class="pure-popper" trigger="click" > @@ -147,7 +157,7 @@ > <ElDivider border-style="dashed" class="tab-divider" /> <ElScrollbar height="220px"> - <ul class="ml-2 flex flex-wrap px-2"> + <ul class="ml-2 flex flex-wrap"> <li v-for="(item, key) in pageList" :key="key" @@ -171,7 +181,7 @@ background class="h-10 flex items-center justify-center" layout="prev, pager, next" - small + size="small" @current-change="onCurrentChange" /> </ElPopover> -- Gitblit v1.9.3