From 2676f45f33b9dedb80d0417e5af603df41216f0b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 19 Nov 2024 18:31:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/components/global/GlobalSearch.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/global/GlobalSearch.vue b/src/components/global/GlobalSearch.vue
index ed4103b..8377e8c 100644
--- a/src/components/global/GlobalSearch.vue
+++ b/src/components/global/GlobalSearch.vue
@@ -4,7 +4,7 @@
<div :style="{ flex: item.flex || 1, minWidth: '28%', ...item.customClass || '' }" class="search-cont"
v-if="showCurSelect(item)">
<span v-show="item.label" class="search-cont-label">{{ item.label }}:</span>
- <el-select :teleported="false" :size="item.size || 'small'" v-model="params[item.props]"
+ <el-select :teleported="false" :size="item.size || ''" v-model="params[item.props]"
:clearable="item.clearable || false" :multiple="item.multiple || false" collapse-tags
:placeholder="item.placeholder || (item.label ? '请选择' + item.label : '请选择')"
:style="{ flex: 1, marginLeft: $px2rem(item.label ? '15px' : '') }"
@@ -18,7 +18,7 @@
<div :style="{ flex: item.flex || 1, minWidth: '28%', ...item.customClass || '' }" class="search-cont"
v-if="item.type === 'input'">
<span v-show="item.label" class="search-cont-label">{{ item.label }}:</span>
- <el-input :size="item.size || 'small'" v-model="params[item.props]" :clearable="item.clearable || false"
+ <el-input :size="item.size || ''" v-model="params[item.props]" :clearable="item.clearable || false"
:placeholder="item.placeholder || (item.label ? '请输入' + item.label : '请输入')"
:style="{ flex: 1, marginLeft: $px2rem(item.label ? '15px' : '') }" @change="searchInputChange($event, item)">
</el-input>
@@ -32,7 +32,7 @@
<div class="search-cont" v-if="item.type === 'datePicker'">
<span v-show="item.label" class="search-cont-label">{{ item.label }}:</span>
- <el-date-picker :append-to-body="false" :size="item.size || 'small'" v-model="params[item.props]"
+ <el-date-picker :append-to-body="false" :size="item.size || ''" v-model="params[item.props]"
:pickerOptions="item.pickerOptions || {}" :format="item.format || 'yyyy-MM-dd HH:mm:ss'"
:clearable="item.clearable || false" :type="item.pickerType || 'daterange'" range-separator="至"
start-placeholder="开始日期" end-placeholder="结束日期" :value-format="item.format || 'yyyy-MM-dd HH:mm:ss'"
@@ -44,7 +44,7 @@
<!-- :picker-options="pickerOptions" -->
<div class="search-cont" v-if="item.type === 'date' && options.quickDateBtn">
<span v-show="item.label" class="search-cont-label">{{ item.label }}:</span>
- <el-date-picker :append-to-body="false" :size="item.size || 'small'" v-model="params[item.props]" type="date"
+ <el-date-picker :append-to-body="false" :size="item.size || ''" v-model="params[item.props]" type="date"
:clearable="item.clearable || false" :placeholder="item.placeholder || item.label || '选择时间'"
:style="{ width: $px2rem(`${item.width || '140'}px`), marginLeft: $px2rem(item.label ? '15px' : '') }"
:editable="false" :disabled="currentDateType != 3" :value-format="item.format || 'yyyy-MM-dd'">
@@ -60,7 +60,7 @@
<div class="search-cont" v-if="item.type === 'multiDate' && options.quickMultiDateBtn">
<span v-show="item.label" class="search-cont-label">{{ item.label }}:</span>
- <el-date-picker :append-to-body="false" :size="item.size || 'small'" v-model="params[item.props]"
+ <el-date-picker :append-to-body="false" :size="item.size || ''" v-model="params[item.props]"
:type="multiDateType" :key="multiDateType" :clearable="item.clearable || false"
:placeholder="item.placeholder || item.label || '多选择时间'" :editable="false"
:style="{ width: $px2rem(`${item.width || '180'}px`), marginLeft: $px2rem(item.label ? '15px' : '') }"
@@ -72,19 +72,19 @@
<div class="search-cont search-cont-btn" v-if="options.searchBtnGroup">
<el-button v-if="options.searchBtn || false"
:type="options.searchBtnTitleShow ? '' : options.searchType || 'primary'"
- :disabled="options.searchDisabled || false" :size="options.searchSize || 'small'" :icon="Search"
+ :disabled="options.searchDisabled || false" :size="options.searchSize || ''" :icon="Search"
@click="searchClick" :class="{ 'btn-h32-w76': options.searchBtnTitleShow ? false : true }">{{
options.searchBtnTitleShow ?
options.searchBtnTitle : '查 询'
}}</el-button>
<el-button v-if="options.resetBtn || false" :type="options.resetType || ''"
- :disabled="options.resetDisabled || false" :size="options.resetSize || 'small'" :icon="Refresh"
+ :disabled="options.resetDisabled || false" :size="options.resetSize || ''" :icon="Refresh"
@click="resetClick" class="btn-h32-w76 reset-btn">重
置</el-button>
<el-button v-if="options.exportBtn || false" :type="options.exportType || 'primary'"
- :disabled="options.exportDisabled || false" :size="options.exportSize || 'small'" :icon="Download"
+ :disabled="options.exportDisabled || false" :size="options.exportSize || ''" :icon="Download"
@click="exportClick" class="btn-h32-w76">导 出</el-button>
</div>
</div>
--
Gitblit v1.9.3