Merge remote-tracking branch 'origin/main'

This commit is contained in:
ChenQiuYu 2025-05-08 09:20:01 +08:00
commit 44a6a90e9f
2 changed files with 16 additions and 15 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<el-popover placement="bottom-start" :visible="isVisible" width="40%" ref="popoverRef" <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
:trigger-keys="[]"> :trigger-keys="[]">
<template #reference> <template #reference>
<el-input <el-input
@ -58,7 +58,7 @@ const props = defineProps({
}, },
width: { width: {
type: Number, type: Number,
default: 1000 default: 600
}, },
showConfig: { showConfig: {
type: Array as () => showConfig[], type: Array as () => showConfig[],

View File

@ -1,13 +1,15 @@
<template> <template>
<el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef" @before-enter="beforeShow" @hide ="afterShow"> <el-popover placement="bottom-start" :visible="isVisible" :width="props.width" ref="popoverRef"
@before-enter="beforeShow" @hide="afterShow">
<template #reference> <template #reference>
<el-input v-model="keyword" :style="{width:props.width+'px',height: 100+'%'}" @input="changeInput" :disabled="disabled" @click="changeInput" <el-input v-model="keyword" style="width: 100%" @input="changeInput" :disabled="disabled" @click="changeInput"
placeholder="诊断选择" ref="inputRef" @focus="focus" @blur="handleBlur"></el-input> placeholder="诊断选择" ref="inputRef" @focus="focus" @blur="handleBlur"></el-input>
</template> </template>
<div class="container"> <div class="container">
<el-table :data="searchList" style="width: 100%" @row-click="clickRow" :show-header="props.showHeader" size="small" <el-table :data="searchList" style="width: 100%" @row-click="clickRow" :show-header="props.showHeader"
size="small"
max-height="250px"> max-height="250px">
<el-table-column v-for="item in showConfig" :prop="item.prop" :label="item.label" <el-table-column v-for="item in showConfig" :prop="item.prop" :label="item.label"
show-overflow-tooltip></el-table-column> show-overflow-tooltip></el-table-column>
@ -53,7 +55,6 @@ const props = defineProps({
const inputRef = ref(); const inputRef = ref();
const searchList = ref([]); const searchList = ref([]);
const changeInput = (inputStr: string) => { const changeInput = (inputStr: string) => {
unref(popoverRef).popperRef?.delayHide?.() unref(popoverRef).popperRef?.delayHide?.()