Merge branch 'master' into hotfix_KLTable

kaola-fed · Aug 14, 2017 · 27ecc60 · 27ecc60
2 parents 141748a + 58d28f0
commit 27ecc60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/js/components/form/KLMultiSelect/index.js b/src/js/components/form/KLMultiSelect/index.js
@@ -314,12 +314,12 @@ const KLMultiSelect = Dropdown.extend({
   },
   // 删除某一项
   delete(event, item) {
+    const data = this.data;
     event && event.stopPropagation();
     if (data.disabled || data.readonly) {
       return;
     }
     this.toggle(true);
-    const data = this.data;
     const _list = data.value.toString().split(data.separator);
     _list.splice(
       _list.indexOf((item[data.key].toString() || '').toString()),

diff --git a/src/js/components/form/KLSelect/index.mcss b/src/js/components/form/KLSelect/index.mcss
@@ -26,11 +26,14 @@
         $border: $u-formctrl_border;
         $border-radius: $border-radius-base;
         overflow-y: auto;
+        position: relative;
 
         .u-icon {
             float: right;
             width: auto;
             line-height: inherit;
+            position: absolute;
+            right: 5px;
         }
 
         .u-select-errorIcon {

diff --git a/src/js/components/navigation/KLPager/index.mcss b/src/js/components/navigation/KLPager/index.mcss
@@ -82,6 +82,9 @@ $m-pager_li_a_size = 24px;
             width: 81px;
             .dropdown_hd {
                 width: 80px;
+                .u-icon {
+                    position: static;
+                }
             }
         }
     }