Skip to content

Commit 8e251a4

Browse files
committed
fix: fix uiParts and column-after slot for cascader (ecomfe#824)
1 parent 59dfdd0 commit 8e251a4

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

packages/veui-theme-dls/components/Cascader.js

-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import { IconChevronDown, IconTimesCircle } from 'dls-icons-vue'
22
import config from 'veui/managers/config'
33

4-
const CHECKBOX_SIZE_MAP = {
5-
xs: 's',
6-
s: 's',
7-
m: 'm',
8-
l: 'm'
9-
}
10-
114
const TAG_SIZE_MAP = {
125
xs: 's',
136
s: 's',
@@ -32,7 +25,6 @@ config.defaults(
3225
},
3326
parts: {
3427
clear: 'icon aux',
35-
checkbox: ({ size }) => CHECKBOX_SIZE_MAP[size] || size,
3628
tag: ({ size }) => TAG_SIZE_MAP[size] || size
3729
}
3830
},

packages/veui-theme-dls/components/CascaderPane.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
import { IconChevronRight } from 'dls-icons-vue'
22
import config from 'veui/managers/config'
33

4+
const CHECKBOX_SIZE_MAP = {
5+
xs: 's',
6+
s: 's',
7+
m: 'm',
8+
l: 'm'
9+
}
10+
411
config.defaults(
512
{
613
icons: {
@@ -9,8 +16,12 @@ config.defaults(
916
ui: {
1017
size: {
1118
values: ['xs', 's', 'm', 'l'],
12-
inherit: true
19+
inherit: true,
20+
default: 'm'
1321
}
22+
},
23+
parts: {
24+
checkbox: ({ size }) => CHECKBOX_SIZE_MAP[size] || size
1425
}
1526
},
1627
'cascaderpane'

packages/veui-theme-dls/trigger.less

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
@adjusted-select-padding-y: dls-sum(@dls-select-padding-y, -1px);
33
@trigger: ~"@{veui-prefix}-trigger";
44

5+
cursor: pointer;
6+
57
&-icon {
68
display: flex;
79
position: relative;
@@ -62,6 +64,7 @@
6264
}
6365

6466
&-searchable {
67+
cursor: text;
6568
.@{veui-prefix}-input-input {
6669
display: block;
6770
}

packages/veui/src/components/Cascader/CascaderPane.vue

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
<veui-checkbox
7979
v-if="multiple"
8080
tabindex="-1"
81+
:ui="uiParts.checkbox"
8182
:checked="option.checked"
8283
:indeterminate="option.partialChecked"
8384
:disabled="isDisabled(option, parents, group.parents)"
@@ -119,7 +120,7 @@
119120
</abstract-tree>
120121
<div
121122
v-if="$scopedSlots['column-after']"
122-
:class="$c('cascader-column-column-after')"
123+
:class="$c('cascader-pane-column-after')"
123124
>
124125
<slot
125126
name="column-after"

packages/veui/src/components/_SelectTrigger.vue

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ export default {
165165
return (
166166
<Tag
167167
key={value}
168+
ui={this.uiParts.tag}
168169
data-key={value}
169170
onRemove={() => this.$emit('remove', item)}
170171
disabled={this.realDisabled || this.realReadonly || disabled}

0 commit comments

Comments
 (0)