fix: fix uiParts and column-after slot for cascader (#824)

ecomfe · May 7, 2021 · 60a027e · 60a027e
1 parent 183098f
commit 60a027e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -78,6 +78,7 @@
                 <veui-checkbox
                   v-if="multiple"
                   tabindex="-1"
+                  :ui="uiParts.checkbox"
                   :checked="option.checked"
                   :indeterminate="option.partialChecked"
                   :disabled="isDisabled(option, parents, group.parents)"
@@ -119,7 +120,7 @@
       </abstract-tree>
       <div
         v-if="$scopedSlots['column-after']"
-        :class="$c('cascader-column-column-after')"
+        :class="$c('cascader-pane-column-after')"
       >
         <slot
           name="column-after"

diff --git a/packages/veui/src/components/_SelectTrigger.vue b/packages/veui/src/components/_SelectTrigger.vue
@@ -165,6 +165,7 @@ export default {
         return (
           <Tag
             key={value}
+            ui={this.uiParts.tag}
             data-key={value}
             onRemove={() => this.$emit('remove', item)}
             disabled={this.realDisabled || this.realReadonly || disabled}