diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index ba55463..475f4ad 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -7,6 +7,7 @@ Star, } from '@element-plus/icons-vue' // props参数 +type Size = 'small' | 'large' | 'default' | '' const props = defineProps({ type: { type: String, @@ -27,10 +28,13 @@ size: { type: String, default: '', + validator: (value: string) => { + return ['', 'small', 'large', 'default', 'mini'].includes(value) + }, }, // 按钮及输入框大小 icon: { type: Boolean, - default: true, + default: false, }, // 是否显示图标 }) // 抛出事件 @@ -76,26 +80,26 @@
- + 搜索 - + 高级检索 - + 重置
- - 搜索 + + 查询 - + 高级检索 - + 重置 @@ -107,8 +111,6 @@ .search-div { padding: 12px; padding-bottom: 2px; /* 本身输入框有10px下边距 */ - // padding-left: 0; - // padding-top: 2px; background-color: #fff; /* Safari */ display: flex; justify-content: space-between; diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index ba55463..475f4ad 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -7,6 +7,7 @@ Star, } from '@element-plus/icons-vue' // props参数 +type Size = 'small' | 'large' | 'default' | '' const props = defineProps({ type: { type: String, @@ -27,10 +28,13 @@ size: { type: String, default: '', + validator: (value: string) => { + return ['', 'small', 'large', 'default', 'mini'].includes(value) + }, }, // 按钮及输入框大小 icon: { type: Boolean, - default: true, + default: false, }, // 是否显示图标 }) // 抛出事件 @@ -76,26 +80,26 @@
- + 搜索 - + 高级检索 - + 重置
- - 搜索 + + 查询 - + 高级检索 - + 重置 @@ -107,8 +111,6 @@ .search-div { padding: 12px; padding-bottom: 2px; /* 本身输入框有10px下边距 */ - // padding-left: 0; - // padding-top: 2px; background-color: #fff; /* Safari */ display: flex; justify-content: space-between; diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 0f71917..192c08c 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -122,9 +122,7 @@ diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index ba55463..475f4ad 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -7,6 +7,7 @@ Star, } from '@element-plus/icons-vue' // props参数 +type Size = 'small' | 'large' | 'default' | '' const props = defineProps({ type: { type: String, @@ -27,10 +28,13 @@ size: { type: String, default: '', + validator: (value: string) => { + return ['', 'small', 'large', 'default', 'mini'].includes(value) + }, }, // 按钮及输入框大小 icon: { type: Boolean, - default: true, + default: false, }, // 是否显示图标 }) // 抛出事件 @@ -76,26 +80,26 @@
- + 搜索 - + 高级检索 - + 重置
- - 搜索 + + 查询 - + 高级检索 - + 重置 @@ -107,8 +111,6 @@ .search-div { padding: 12px; padding-bottom: 2px; /* 本身输入框有10px下边距 */ - // padding-left: 0; - // padding-top: 2px; background-color: #fff; /* Safari */ display: flex; justify-content: space-between; diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 0f71917..192c08c 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -122,9 +122,7 @@ diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue index 81b1e4d..0f8f473 100644 --- a/src/views/system/dept/listDept.vue +++ b/src/views/system/dept/listDept.vue @@ -104,12 +104,8 @@ diff --git a/src/components/SearchArea/index.vue b/src/components/SearchArea/index.vue index ba55463..475f4ad 100644 --- a/src/components/SearchArea/index.vue +++ b/src/components/SearchArea/index.vue @@ -7,6 +7,7 @@ Star, } from '@element-plus/icons-vue' // props参数 +type Size = 'small' | 'large' | 'default' | '' const props = defineProps({ type: { type: String, @@ -27,10 +28,13 @@ size: { type: String, default: '', + validator: (value: string) => { + return ['', 'small', 'large', 'default', 'mini'].includes(value) + }, }, // 按钮及输入框大小 icon: { type: Boolean, - default: true, + default: false, }, // 是否显示图标 }) // 抛出事件 @@ -76,26 +80,26 @@
- + 搜索 - + 高级检索 - + 重置
- - 搜索 + + 查询 - + 高级检索 - + 重置 @@ -107,8 +111,6 @@ .search-div { padding: 12px; padding-bottom: 2px; /* 本身输入框有10px下边距 */ - // padding-left: 0; - // padding-top: 2px; background-color: #fff; /* Safari */ display: flex; justify-content: space-between; diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 0f71917..192c08c 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -122,9 +122,7 @@ diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue index 81b1e4d..0f8f473 100644 --- a/src/views/system/dept/listDept.vue +++ b/src/views/system/dept/listDept.vue @@ -104,12 +104,8 @@ diff --git a/src/views/system/dict/listDict.vue b/src/views/system/dict/listDict.vue index 4fc927b..c510755 100644 --- a/src/views/system/dict/listDict.vue +++ b/src/views/system/dict/listDict.vue @@ -105,9 +105,7 @@