iov-design 2.15.23 → 2.15.25

package/lib/cascader-panel.js

@@ -497,13 +497,13 @@ var stopPropagation = function stopPropagation(e) {
       );
     },
     renderCheckIcon: function renderCheckIcon(h) {
-      return h('i', { 'class': 'el-icon-check el-cascader-node__prefix' });
+      return h('i', { 'class': 'el-cascader-node__prefix' });
     },
     renderLoadingIcon: function renderLoadingIcon(h) {
       return h('i', { 'class': 'el-icon-loading el-cascader-node__postfix' });
     },
     renderExpandIcon: function renderExpandIcon(h) {
-      return h('i', { 'class': 'el-icon-arrow-right el-cascader-node__postfix' });
+      return h('i', { 'class': 'iov-icon-right el-cascader-node__postfix' });
     },
     renderContent: function renderContent(h) {
       var panel = this.panel,

package/lib/cascader.js

@@ -266,11 +266,24 @@ var render = function() {
           }
         },
         [
+          _vm.$slots.prefixLabel
+            ? _c(
+                "template",
+                { slot: "prefixLabel" },
+                [_vm._t("prefixLabel")],
+                2
+              )
+            : _vm._e(),
+          _vm.$slots.prefix
+            ? _c("template", { slot: "prefix" }, [_vm._t("prefix")], 2)
+            : _vm._e(),
           _c("template", { slot: "suffix" }, [
             _vm.clearBtnVisible
               ? _c("i", {
                   key: "clear",
-                  staticClass: "el-input__icon el-icon-circle-close",
+                  staticClass:
+                    "el-input__icon iov-icon-close-mini el-input__clear",
+                  staticStyle: { "padding-right": "0" },
                   on: {
                     click: function($event) {
                       $event.stopPropagation()
@@ -282,7 +295,7 @@ var render = function() {
                   key: "arrow-down",
                   class: [
                     "el-input__icon",
-                    "el-icon-arrow-down",
+                    "iov-icon-arrow-up",
                     _vm.dropDownVisible && "is-reverse"
                   ],
                   on: {
@@ -306,6 +319,7 @@ var render = function() {
                   "el-tag",
                   {
                     key: tag.key,
+                    class: { "is-disabled": !tag.closable && tag.key !== -1 },
                     attrs: {
                       type: "info",
                       size: _vm.tagSize,
@@ -474,12 +488,7 @@ var render = function() {
                                   }
                                 }
                               },
-                              [
-                                _c("span", [_vm._v(_vm._s(item.text))]),
-                                item.checked
-                                  ? _c("i", { staticClass: "el-icon-check" })
-                                  : _vm._e()
-                              ]
+                              [_c("span", [_vm._v(_vm._s(item.text))])]
                             )
                           })
                         : _vm._t("empty", [
@@ -681,6 +690,13 @@ var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -739,9 +755,9 @@ var PopperMixin = {
 };
 
 var InputSizeMap = {
-  medium: 36,
-  small: 32,
-  mini: 28
+  medium: 32,
+  small: 30,
+  mini: 26
 };
 
 /* harmony default export */ var cascadervue_type_script_lang_js_ = ({
@@ -827,7 +843,10 @@ var InputSizeMap = {
       return this.size || _elFormItemSize || (this.$ELEMENT || {}).size;
     },
     tagSize: function tagSize() {
-      return ['small', 'mini'].indexOf(this.realSize) > -1 ? 'mini' : 'small';
+      return this.realSize;
+      // return ['small', 'mini'].indexOf(this.realSize) > -1
+      //   ? 'mini'
+      //   : 'small';
     },
     isDisabled: function isDisabled() {
       return this.disabled || (this.elForm || {}).disabled;
@@ -932,7 +951,7 @@ var InputSizeMap = {
     var input = this.$refs.input;
 
     if (input && input.$el) {
-      this.inputInitialHeight = input.$el.offsetHeight || InputSizeMap[this.realSize] || 40;
+      this.inputInitialHeight = Math.max(input.$el.offsetHeight, InputSizeMap[this.realSize]) || 36;
     }
 
     if (!this.isEmptyValue(this.value)) {
@@ -1135,7 +1154,7 @@ var InputSizeMap = {
           if (collapseTags) {
             tags.push({
               key: -1,
-              text: '+ ' + restCount,
+              text: '+' + restCount,
               closable: false
             });
           } else {
@@ -1262,6 +1281,9 @@ var InputSizeMap = {
       if (!inputInner) return;
 
       var tags = $el.querySelector('.el-cascader__tags');
+      var groupPrefix = $el.querySelector('.el-input-group--prefix');
+      var prefix = $el.querySelector('.el-input__prefix');
+      var prefixLabel = $el.querySelector('.el-input-group__prefix-label');
       var suggestionPanelEl = null;
 
       if (suggestionPanel && (suggestionPanelEl = suggestionPanel.$el)) {
@@ -1271,8 +1293,15 @@ var InputSizeMap = {
 
       if (tags) {
         var offsetHeight = Math.round(tags.getBoundingClientRect().height);
-        var height = Math.max(offsetHeight + 6, inputInitialHeight) + 'px';
-        inputInner.style.height = height;
+        var height = Math.max(offsetHeight + 4, inputInitialHeight) + 'px';
+        var inputPaddingLeft = groupPrefix || prefix ? Math.round(window.getComputedStyle(inputInner).paddingLeft.replace(/px/, '')) : 0;
+        var prefixLabelWidth = prefixLabel && Math.round(prefixLabel.getBoundingClientRect().width) || 0;
+        if (groupPrefix) {
+          groupPrefix.style.height = height;
+        } else {
+          inputInner.style.height = height;
+        }
+        tags.style.left = prefixLabelWidth + inputPaddingLeft + 'px';
         if (this.dropDownVisible) {
           this.updatePopper();
         }