iov-design 2.15.56 → 2.15.57

package/lib/input.js

@@ -951,9 +951,13 @@ var shared_ = __webpack_require__(21);
       var isButton = pendantEl.querySelector('.el-button');
       if (isSelect) {
         Object(dom_["addClass"])(pendantEl, 'is-select');
+      } else {
+        Object(dom_["removeClass"])(pendantEl, 'is-select');
       }
       if (isButton) {
         Object(dom_["addClass"])(pendantEl, 'is-button');
+      } else {
+        Object(dom_["removeClass"])(pendantEl, 'is-button');
       }
     },
     calcIconOffset: function calcIconOffset(place) {

package/lib/iov-design.common.js

@@ -5034,9 +5034,13 @@ var shared_ = __webpack_require__(19);
       var isButton = pendantEl.querySelector('.el-button');
       if (isSelect) {
         Object(dom_["addClass"])(pendantEl, 'is-select');
+      } else {
+        Object(dom_["removeClass"])(pendantEl, 'is-select');
       }
       if (isButton) {
         Object(dom_["addClass"])(pendantEl, 'is-button');
+      } else {
+        Object(dom_["removeClass"])(pendantEl, 'is-button');
       }
     },
     calcIconOffset: function calcIconOffset(place) {
@@ -7664,7 +7668,7 @@ var selectvue_type_template_id_0e4aade6_render = function() {
                                     closable: !_vm.selectDisabled,
                                     size: _vm.collapseTagSize,
                                     hit: item.hitState,
-                                    maxWidth: _vm.multipleTagMaxWidth,
+                                    maxWidth: _vm.maxWidth,
                                     type: "info",
                                     "disable-transitions": ""
                                   },
@@ -7685,10 +7689,13 @@ var selectvue_type_template_id_0e4aade6_render = function() {
                             : _vm._e()
                         ]
                       }),
-                      _vm.selected.length > 1
+                      (_vm.selected.length > 1 &&
+                        _vm.selected.length > _vm.multipleLimitShow) ||
+                      (_vm.selected.length > 0 && _vm.collapseTagsFixed)
                         ? _c(
                             "el-tag",
                             {
+                              ref: "tagsCount",
                               staticClass: "el-select__tags-count",
                               class: {
                                 "el-select__tags-count-fixed":
@@ -7708,7 +7715,12 @@ var selectvue_type_template_id_0e4aade6_render = function() {
                                 [
                                   _vm._v(
                                     _vm._s(_vm.collapseTagsFixed ? "" : "+") +
-                                      _vm._s(_vm.selected.length - 1) +
+                                      _vm._s(
+                                        _vm.collapseTagsFixed
+                                          ? _vm.selected.length
+                                          : _vm.selected.length -
+                                              _vm.multipleLimitShow
+                                      ) +
                                       _vm._s(_vm.collapseTagsSuffix)
                                   )
                                 ]
@@ -7736,7 +7748,7 @@ var selectvue_type_template_id_0e4aade6_render = function() {
                             closable: !item.disabled && !_vm.selectDisabled,
                             size: _vm.collapseTagSize,
                             hit: item.hitState,
-                            maxWidth: _vm.multipleTagMaxWidth,
+                            maxWidth: _vm.maxWidth,
                             type: "info",
                             "disable-transitions": ""
                           },
@@ -8729,6 +8741,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
 //
 //
 //
+//
 
 
 
@@ -8772,6 +8785,18 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
 
 
   computed: {
+    // maxWidth() {
+    //   if (this.collapseTags) {
+    //     if (this.multipleTagMaxWidth && this.multipleTagMaxWidth !== 'none') {
+    //       return this.multipleTagMaxWidth;
+    //     }
+    //     const tagsCountWidth = this.$refs.tagsCount && this.$refs.tagsCount.$el.clientWidth || 0;
+    //     const count = this.selected.length <= this.multipleLimitShow ? this.selected.length : this.multipleLimitShow;
+    //     return Math.floor((this.inputWidth - this.tagsLeft - 32 - tagsCountWidth - 20 - count * 16) / count) + 'px';
+    //   } else {
+    //     return this.multipleTagMaxWidth || 'none';
+    //   }
+    // },
     _elFormItemSize: function _elFormItemSize() {
       return (this.elFormItem || {}).elFormItemSize;
     },
@@ -8938,7 +8963,8 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       menuVisibleOnFocus: false,
       isOnComposition: false,
       isSilentBlur: false,
-      tagsLeft: 0
+      tagsLeft: 0,
+      maxWidth: 'none'
     };
   },
 
@@ -8966,6 +8992,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
           this.query = '';
           this.handleQueryChange(this.query);
         }
+        this.getMaxWidth();
       }
       this.setSelected();
       if (this.filterable && !this.multiple) {
@@ -9051,19 +9078,35 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
   },
 
   methods: {
+    getMaxWidth: function getMaxWidth() {
+      var _this5 = this;
+
+      this.$nextTick(function () {
+        if (_this5.collapseTags) {
+          if (_this5.multipleTagMaxWidth && _this5.multipleTagMaxWidth !== 'none') {
+            _this5.maxWidth = _this5.multipleTagMaxWidth;
+          }
+          var tagsCountWidth = _this5.$refs.tagsCount && _this5.$refs.tagsCount.$el.clientWidth || 0;
+          var count = _this5.selected.length <= _this5.multipleLimitShow ? _this5.selected.length : _this5.multipleLimitShow;
+          _this5.maxWidth = Math.floor((_this5.inputWidth - _this5.tagsLeft - 32 - tagsCountWidth - 20 - count * 16) / count) + 'px';
+        } else {
+          _this5.maxWidth = _this5.multipleTagMaxWidth || 'none';
+        }
+      });
+    },
     handleNavigate: function handleNavigate(direction) {
       if (this.isOnComposition) return;
 
       this.navigateOptions(direction);
     },
     handleComposition: function handleComposition(event) {
-      var _this5 = this;
+      var _this6 = this;
 
       var text = event.target.value;
       if (event.type === 'compositionend') {
         this.isOnComposition = false;
         this.$nextTick(function (_) {
-          return _this5.handleQueryChange(text);
+          return _this6.handleQueryChange(text);
         });
       } else {
         var lastCharacter = text[text.length - 1] || '';
@@ -9071,7 +9114,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       }
     },
     handleQueryChange: function handleQueryChange(val) {
-      var _this6 = this;
+      var _this7 = this;
 
       if (this.previousQuery === val || this.isOnComposition) return;
       if (this.previousQuery === null && (typeof this.filterMethod === 'function' || typeof this.remoteMethod === 'function')) {
@@ -9080,15 +9123,15 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       }
       this.previousQuery = val;
       this.$nextTick(function () {
-        if (_this6.visible) _this6.broadcast('ElSelectDropdown', 'updatePopper');
+        if (_this7.visible) _this7.broadcast('ElSelectDropdown', 'updatePopper');
       });
       this.hoverIndex = -1;
       if (this.multiple && this.filterable) {
         this.$nextTick(function () {
-          var length = _this6.$refs.input.value.length * 15 + 20;
-          _this6.inputLength = _this6.collapseTags ? Math.min(50, length) : length;
-          _this6.managePlaceholder();
-          _this6.resetInputHeight();
+          var length = _this7.$refs.input.value.length * 15 + 20;
+          _this7.inputLength = _this7.collapseTags ? Math.min(50, length) : length;
+          _this7.managePlaceholder();
+          _this7.resetInputHeight();
         });
       }
       if (this.remote && typeof this.remoteMethod === 'function') {
@@ -9115,10 +9158,10 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       this.$refs.scrollbar && this.$refs.scrollbar.handleScroll();
     },
     handleMenuEnter: function handleMenuEnter() {
-      var _this7 = this;
+      var _this8 = this;
 
       this.$nextTick(function () {
-        return _this7.scrollToOption(_this7.selected);
+        return _this8.scrollToOption(_this8.selected);
       });
     },
     emitChange: function emitChange(val) {
@@ -9152,7 +9195,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       return newOption;
     },
     setSelected: function setSelected() {
-      var _this8 = this;
+      var _this9 = this;
 
       if (!this.multiple) {
         var option = this.getOption(this.value);
@@ -9170,12 +9213,12 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       var result = [];
       if (Array.isArray(this.value)) {
         this.value.forEach(function (value) {
-          result.push(_this8.getOption(value));
+          result.push(_this9.getOption(value));
         });
       }
       this.selected = result;
       this.$nextTick(function () {
-        _this8.resetInputHeight();
+        _this9.resetInputHeight();
       });
     },
     handleFocus: function handleFocus(event) {
@@ -9196,13 +9239,13 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       this.$refs.reference.blur();
     },
     handleBlur: function handleBlur(event) {
-      var _this9 = this;
+      var _this10 = this;
 
       setTimeout(function () {
-        if (_this9.isSilentBlur) {
-          _this9.isSilentBlur = false;
+        if (_this10.isSilentBlur) {
+          _this10.isSilentBlur = false;
         } else {
-          _this9.$emit('blur', event);
+          _this10.$emit('blur', event);
         }
       }, 50);
       this.softFocus = false;
@@ -9243,15 +9286,15 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       }
     },
     resetTagsLeft: function resetTagsLeft() {
-      var _this10 = this;
+      var _this11 = this;
 
       this.$nextTick(function () {
-        var prefixLabel = _this10.$el.querySelector('.el-input-group__prefix-label');
-        var prefix = _this10.$el.querySelector('.el-input__prefix');
-        var inputInner = _this10.$el.querySelector('.el-input__inner');
+        var prefixLabel = _this11.$el.querySelector('.el-input-group__prefix-label');
+        var prefix = _this11.$el.querySelector('.el-input__prefix');
+        var inputInner = _this11.$el.querySelector('.el-input__inner');
         var prefixLabelWidth = prefixLabel && Math.round(prefixLabel.getBoundingClientRect().width) || 0;
         var inputPaddingLeft = prefixLabel || prefix ? Math.round(window.getComputedStyle(inputInner).paddingLeft.replace(/px/, '')) : 0;
-        _this10.tagsLeft = prefixLabelWidth + inputPaddingLeft;
+        _this11.tagsLeft = prefixLabelWidth + inputPaddingLeft;
       });
     },
     resetInputState: function resetInputState(e) {
@@ -9260,42 +9303,42 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       this.resetInputHeight();
     },
     resetInputHeight: function resetInputHeight() {
-      var _this11 = this;
+      var _this12 = this;
 
       if (this.collapseTags && !this.filterable) return;
       this.$nextTick(function () {
-        if (!_this11.$refs.reference) return;
-        var inputInner = _this11.$el.querySelector('.el-input__inner');
-        var groupPrefix = _this11.$el.querySelector('.el-input-group--prefix');
+        if (!_this12.$refs.reference) return;
+        var inputInner = _this12.$el.querySelector('.el-input__inner');
+        var groupPrefix = _this12.$el.querySelector('.el-input-group--prefix');
         var input = groupPrefix || inputInner;
-        var tags = _this11.$refs.tags;
+        var tags = _this12.$refs.tags;
         var tagsHeight = tags ? Math.round(tags.getBoundingClientRect().height) : 0;
-        var sizeInMap = _this11.initialInputHeight || 36;
-        input.style.height = _this11.selected.length === 0 ? sizeInMap + 'px' : Math.max(tags ? tagsHeight + (tagsHeight > sizeInMap ? 6 : 0) : 0, sizeInMap) + 'px';
-        if (_this11.visible && _this11.emptyText !== false) {
-          _this11.broadcast('ElSelectDropdown', 'updatePopper');
+        var sizeInMap = _this12.initialInputHeight || 36;
+        input.style.height = _this12.selected.length === 0 ? sizeInMap + 'px' : Math.max(tags ? tagsHeight + (tagsHeight > sizeInMap ? 6 : 0) : 0, sizeInMap) + 'px';
+        if (_this12.visible && _this12.emptyText !== false) {
+          _this12.broadcast('ElSelectDropdown', 'updatePopper');
         }
       });
     },
     resetHoverIndex: function resetHoverIndex() {
-      var _this12 = this;
+      var _this13 = this;
 
       setTimeout(function () {
-        if (!_this12.multiple) {
-          _this12.hoverIndex = _this12.options.indexOf(_this12.selected);
+        if (!_this13.multiple) {
+          _this13.hoverIndex = _this13.options.indexOf(_this13.selected);
         } else {
-          if (_this12.selected.length > 0) {
-            _this12.hoverIndex = Math.min.apply(null, _this12.selected.map(function (item) {
-              return _this12.options.indexOf(item);
+          if (_this13.selected.length > 0) {
+            _this13.hoverIndex = Math.min.apply(null, _this13.selected.map(function (item) {
+              return _this13.options.indexOf(item);
             }));
           } else {
-            _this12.hoverIndex = -1;
+            _this13.hoverIndex = -1;
           }
         }
       }, 300);
     },
     handleOptionSelect: function handleOptionSelect(option, byClick) {
-      var _this13 = this;
+      var _this14 = this;
 
       if (this.multiple) {
         var value = (this.value || []).slice();
@@ -9322,7 +9365,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
       // this.setSoftFocus();
       if (this.visible) return;
       this.$nextTick(function () {
-        _this13.scrollToOption(option);
+        _this14.scrollToOption(option);
       });
     },
     setSoftFocus: function setSoftFocus() {
@@ -9455,7 +9498,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
   },
 
   created: function created() {
-    var _this14 = this;
+    var _this15 = this;
 
     this.cachedPlaceHolder = this.currentPlaceholder = this.propPlaceholder;
     if (this.multiple && !Array.isArray(this.value)) {
@@ -9466,18 +9509,18 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
     }
 
     this.debouncedOnInputChange = debounce_default()(this.debounce, function () {
-      _this14.onInputChange();
+      _this15.onInputChange();
     });
 
     this.debouncedQueryChange = debounce_default()(this.debounce, function (e) {
-      _this14.handleQueryChange(e.target.value);
+      _this15.handleQueryChange(e.target.value);
     });
 
     this.$on('handleOptionClick', this.handleOptionSelect);
     this.$on('setSelected', this.setSelected);
   },
   mounted: function mounted() {
-    var _this15 = this;
+    var _this16 = this;
 
     if (this.multiple && Array.isArray(this.value) && this.value.length > 0) {
       this.currentPlaceholder = '';
@@ -9499,7 +9542,7 @@ var scroll_into_view_default = /*#__PURE__*/__webpack_require__.n(scroll_into_vi
     }
     this.$nextTick(function () {
       if (reference && reference.$el) {
-        _this15.inputWidth = reference.$el.getBoundingClientRect().width;
+        _this16.inputWidth = reference.$el.getBoundingClientRect().width;
       }
     });
     this.setSelected();
@@ -45032,7 +45075,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '2.15.56',
+  version: '2.15.57',
   locale: lib_locale_default.a.use,
   i18n: lib_locale_default.a.i18n,
   install: src_install,