diff --git a/packages/veui-theme-dls/components/Cascader.js b/packages/veui-theme-dls/components/Cascader.js index 47f8d712c..2f2956c28 100644 --- a/packages/veui-theme-dls/components/Cascader.js +++ b/packages/veui-theme-dls/components/Cascader.js @@ -1,13 +1,6 @@ import { IconChevronDown, IconTimesCircle } from 'dls-icons-vue' import config from 'veui/managers/config' -const CHECKBOX_SIZE_MAP = { - xs: 's', - s: 's', - m: 'm', - l: 'm' -} - const TAG_SIZE_MAP = { xs: 's', s: 's', @@ -32,7 +25,6 @@ config.defaults( }, parts: { clear: 'icon aux', - checkbox: ({ size }) => CHECKBOX_SIZE_MAP[size] || size, tag: ({ size }) => TAG_SIZE_MAP[size] || size } }, diff --git a/packages/veui-theme-dls/components/CascaderPane.js b/packages/veui-theme-dls/components/CascaderPane.js index 4b49eaf88..3530b77a5 100644 --- a/packages/veui-theme-dls/components/CascaderPane.js +++ b/packages/veui-theme-dls/components/CascaderPane.js @@ -1,6 +1,13 @@ import { IconChevronRight } from 'dls-icons-vue' import config from 'veui/managers/config' +const CHECKBOX_SIZE_MAP = { + xs: 's', + s: 's', + m: 'm', + l: 'm' +} + config.defaults( { icons: { @@ -9,8 +16,12 @@ config.defaults( ui: { size: { values: ['xs', 's', 'm', 'l'], - inherit: true + inherit: true, + default: 'm' } + }, + parts: { + checkbox: ({ size }) => CHECKBOX_SIZE_MAP[size] || size } }, 'cascaderpane' diff --git a/packages/veui-theme-dls/trigger.less b/packages/veui-theme-dls/trigger.less index 3fc45dbe5..699e1a7b6 100644 --- a/packages/veui-theme-dls/trigger.less +++ b/packages/veui-theme-dls/trigger.less @@ -2,6 +2,8 @@ @adjusted-select-padding-y: dls-sum(@dls-select-padding-y, -1px); @trigger: ~"@{veui-prefix}-trigger"; + cursor: pointer; + &-icon { display: flex; position: relative; @@ -62,6 +64,7 @@ } &-searchable { + cursor: text; .@{veui-prefix}-input-input { display: block; } diff --git a/packages/veui/src/components/Cascader/CascaderPane.vue b/packages/veui/src/components/Cascader/CascaderPane.vue index 15c7ae1e2..ecfdc80ce 100644 --- a/packages/veui/src/components/Cascader/CascaderPane.vue +++ b/packages/veui/src/components/Cascader/CascaderPane.vue @@ -78,6 +78,7 @@
this.$emit('remove', item)} disabled={this.realDisabled || this.realReadonly || disabled}