Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/select20240731 #171

Merged
merged 2 commits into from
Aug 1, 2024
Merged

Feat/select20240731 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5082853
feat: 🎸 Pagination 只有一页的时候不显示跳转输入框
hcsygit Aug 1, 2024
c11b7a2
fix: 🐛 Select popupTip引用方式
hcsygit Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/base/pagination.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default{
page-index="2"
total="160"
page-size="10"
:page-sizes="[5,50,100]"
:page-sizes="[5,50,100,200]"
layout="total,sizes,jumper"
@size-change="sizeChange"
@change="pageChange">
Expand Down
2 changes: 2 additions & 0 deletions doc/base/select.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,8 @@ export default{
| — | Option 组件列表 |
| prefix | select框头部图标 |
| center | select选中值显示 |
| popupTipContent | select popupTip文案 |

### Select Events
|   事件名称 | 说明   |
|---------|---------|
Expand Down
2 changes: 1 addition & 1 deletion sparta/components/base/pagination/src/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
></sp-option>
</sp-select>
</div>
<div v-if="showJumper" class="sp-pagination__jump">
<div v-if="showJumper && pages > 1" class="sp-pagination__jump">
跳至<sp-input
ref="jumperInput"
v-model="jumperPage"
Expand Down
14 changes: 9 additions & 5 deletions sparta/components/base/select/src/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>
</template>
<div v-else-if="groupMultiple">
<sp-popup-tip
<popup-tip
ref="popupTip"
:custom-class="customPopupTipClass"
color="#0D1233"
Expand Down Expand Up @@ -78,9 +78,9 @@
/>
</div>
<template v-if="showGroupMultiPopupTip && !isFocus && groupMultipleSelected && groupMultipleSelected.length" slot="popup">
{{ groupMultipleSelected.map(item => getGroupMultiTextByValue(item)).join(',') }}
<slot name="popupTipContent">{{ groupMultipleSelected.map(item => getGroupMultiTextByValue(item)).join('；') }}</slot>
</template>
</sp-popup-tip>
</popup-tip>
</div>

<!-- 非多选情况-->
Expand Down Expand Up @@ -201,11 +201,13 @@
import Emitter from 'sparta/common/js/mixins/emitter'
import SpSelectDropdown from './select-dropdown'
import { debounce } from 'sparta/common/js/utils/tool'
import PopupTip from '../../popup-tip'
export default {
name: 'SpSelect',

components: {
'sp-select-dropdown': SpSelectDropdown
'sp-select-dropdown': SpSelectDropdown,
'popup-tip': PopupTip
},

mixins: [Emitter],
Expand Down Expand Up @@ -1135,10 +1137,11 @@ export default {
.sp-select__input--filter {
background-color: transparent;
height: 34px;
flex: 1;
min-width: 10px;
padding-right: 46px;
border: none;
outline: none;
box-sizing: border-box;
&.has--selected {
padding-left: 10px;
}
Expand All @@ -1150,6 +1153,7 @@ export default {

.sp-tag-box {
padding-bottom: 3px;
box-sizing: border-box;
}

.sp-tag {
Expand Down
Loading