bk-magic-vue 2.5.9-beta.2 → 2.5.9-beta.21

package/lib/tag-input.js

@@ -1921,11 +1921,11 @@
       staticClass: "point point3"
     }), _c('div', {
       staticClass: "point point4"
-    })]], 2), _c('div', {
+    })]], 2), _vm.title ? _c('div', {
       staticClass: "bk-loading-title"
     }, [_vm._t("title", function () {
       return [_vm._v(_vm._s(_vm.title))];
-    })], 2)])])], 1) : _c('transition', {
+    })], 2) : _vm._e()])])], 1) : _c('transition', {
       attrs: {
         "name": "fade",
         "duration": {
@@ -1977,11 +1977,11 @@
       staticClass: "point point3"
     }), _c('div', {
       staticClass: "point point4"
-    })]], 2), _c('div', {
+    })]], 2), _vm.title ? _c('div', {
       staticClass: "bk-loading-title"
     }, [_vm._t("title", function () {
       return [_vm._v(_vm._s(_vm.title))];
-    })], 2)])])]);
+    })], 2) : _vm._e()])])]);
   };
   var __vue_staticRenderFns__ = [];
 
@@ -2040,6 +2040,9 @@
     if (options.title) {
       el.$vm.title = options.title;
     }
+    if (options.size) {
+      el.$vm.size = options.size;
+    }
   }
   var bkLoading = {
     inserted: function inserted(el, binding) {
@@ -5499,24 +5502,33 @@
       enableCollapseTags: function enableCollapseTags() {
         var isPopoverShown = this.popoverInstance && this.popoverInstance.instance && this.popoverInstance.instance.state.isShown;
         return !this.isEdit && this.collapseTags && this.overflowTagIndex && !isPopoverShown;
+      },
+      collapseTooltip: function collapseTooltip() {
+        var _this = this;
+        return this.localTagList.reduce(function (acc, cur, curIndex) {
+          if (_this.overflowTagIndex !== null && curIndex >= _this.overflowTagIndex) {
+            acc.push(cur[_this.displayKey]);
+          }
+          return acc;
+        }, []);
       }
     },
     watch: {
       curInputValue: function curInputValue(newVal, oldVal) {
-        var _this = this;
+        var _this2 = this;
         if (newVal !== '' && this.renderList.length) {
           this.showList = true;
         } else if (this.trigger !== 'focus') {
           setTimeout(function () {
-            _this.showList = false;
+            _this2.showList = false;
           }, 100);
         }
       },
       showList: function showList(val) {
-        var _this2 = this;
+        var _this3 = this;
         if (val) {
           this.$nextTick(function () {
-            _this2.showPopover();
+            _this3.showPopover();
           });
         }
       },
@@ -5543,7 +5555,7 @@
       }
     },
     created: function created() {
-      var _this3 = this;
+      var _this4 = this;
       this.isSingleSelect = this.maxData === 1;
       this.pageSize = this.maxResult;
       this.getData();
@@ -5551,11 +5563,11 @@
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _this3.resizing = true;
+              _this4.resizing = true;
               _context.next = 3;
-              return _this3.$nextTick(_this3.calcOverflowTagIndex);
+              return _this4.$nextTick(_this4.calcOverflowTagIndex);
             case 3:
-              _this3.resizing = false;
+              _this4.resizing = false;
             case 4:
             case "end":
               return _context.stop();
@@ -5564,7 +5576,7 @@
       }));
     },
     mounted: function mounted() {
-      var _this4 = this;
+      var _this5 = this;
       this.bkTagSelector = this.$refs.bkTagSelector;
       this.popoverInstance = this.$refs['tagInputDropdown'];
       this.containerResizeObserver = new ResizeObserver(function (entries) {
@@ -5573,8 +5585,8 @@
         try {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var entry = _step.value;
-            if (entry.target === _this4.bkTagSelector) {
-              _this4.execResizeHandler();
+            if (entry.target === _this5.bkTagSelector) {
+              _this5.execResizeHandler();
             }
           }
         } catch (err) {
@@ -5629,7 +5641,7 @@
         return bitLen;
       },
       filterData: function filterData() {
-        var _this5 = this;
+        var _this6 = this;
         var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
         val = val.toLowerCase();
         var filterData;
@@ -5638,14 +5650,14 @@
         } else {
           if (isArray$1(this.searchKey)) {
             var filterDataList = this.searchKey.map(function (searchKey) {
-              return _this5.initData.filter(function (item) {
+              return _this6.initData.filter(function (item) {
                 return item[searchKey].toLowerCase().indexOf(val) !== -1;
               });
             });
             filterData = from_1$1(new set$1(filterDataList.flat()));
           } else {
             filterData = this.initData.filter(function (item) {
-              return item[_this5.searchKey].toLowerCase().indexOf(val) !== -1;
+              return item[_this6.searchKey].toLowerCase().indexOf(val) !== -1;
             });
           }
         }
@@ -5672,7 +5684,7 @@
         this.showScrollLoading = false;
       },
       scrollHandler: function scrollHandler(e) {
-        var _this6 = this;
+        var _this7 = this;
         if (this.showScrollLoading || this.isBeforeDestroy) {
           return;
         }
@@ -5689,7 +5701,7 @@
                 while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     _context2.next = 2;
-                    return _this6.pageChange(curPage);
+                    return _this7.pageChange(curPage);
                   case 2:
                   case "end":
                     return _context2.stop();
@@ -5750,15 +5762,15 @@
         return index;
       },
       formatGroupList: function formatGroupList() {
-        var _this7 = this;
+        var _this8 = this;
         var allList = [];
         this.list.forEach(function (item) {
           if (item.children) {
             item.children.forEach(function (child) {
               var params = _objectSpread({}, child);
               params.group = {
-                groupId: item[_this7.saveKey],
-                groupName: item[_this7.displayKey]
+                groupId: item[_this8.saveKey],
+                groupName: item[_this8.displayKey]
               };
               allList.push(params);
             });
@@ -5767,38 +5779,38 @@
         return allList;
       },
       getData: function getData() {
-        var _this8 = this;
+        var _this9 = this;
         this.tagList = [];
         this.localTagList = [];
         this.initData = [];
         if (this.useGroup) {
           this.allList = this.formatGroupList();
           this.allList.forEach(function (item) {
-            _this8.initData.push(item);
+            _this9.initData.push(item);
           });
         } else {
           this.list.forEach(function (item) {
-            _this8.initData.push(item);
+            _this9.initData.push(item);
           });
         }
         if (this.value.length) {
           this.value.forEach(function (tag) {
-            var val = _this8.initData.find(function (val) {
-              return tag === val[_this8.saveKey];
+            var val = _this9.initData.find(function (val) {
+              return tag === val[_this9.saveKey];
             });
             if (val !== undefined) {
-              _this8.localTagList.push(val);
-              _this8.tagList.push(val[_this8.saveKey]);
-            } else if (_this8.allowCreate && !_this8.tagList.includes(tag)) {
+              _this9.localTagList.push(val);
+              _this9.tagList.push(val[_this9.saveKey]);
+            } else if (_this9.allowCreate && !_this9.tagList.includes(tag)) {
               var _temp;
-              var temp = (_temp = {}, _defineProperty(_temp, _this8.saveKey, tag), _defineProperty(_temp, _this8.displayKey, tag), _temp);
-              _this8.localTagList.splice(_this8.localTagList.length, 0, temp);
-              _this8.tagList.splice(_this8.tagList.length, 0, tag);
+              var temp = (_temp = {}, _defineProperty(_temp, _this9.saveKey, tag), _defineProperty(_temp, _this9.displayKey, tag), _temp);
+              _this9.localTagList.splice(_this9.localTagList.length, 0, temp);
+              _this9.tagList.splice(_this9.tagList.length, 0, tag);
             }
           });
           if (!this.isSingleSelect) {
             this.initData = this.initData.filter(function (val) {
-              return !_this8.value.includes(val[_this8.saveKey]);
+              return !_this9.value.includes(val[_this9.saveKey]);
             });
           }
         }
@@ -5814,30 +5826,30 @@
         this.$refs.input.style.width = this.INPUT_MIN_WIDTH + 'px';
       },
       handleInput: function handleInput(event) {
-        var _this9 = this;
+        var _this10 = this;
         var value = event.target.value;
         this.$emit('inputchange', value);
         this.$nextTick(function () {
-          if (_this9.maxData === -1 || _this9.maxData > _this9.tagList.length) {
-            var charLen = _this9.getCharLength(value);
-            _this9.cacheVal = value;
+          if (_this10.maxData === -1 || _this10.maxData > _this10.tagList.length) {
+            var charLen = _this10.getCharLength(value);
+            _this10.cacheVal = value;
             if (charLen) {
-              _this9.isCanRemoveTag = false;
-              _this9.filterData(value);
-              _this9.$refs.input.style.width = charLen * _this9.INPUT_MIN_WIDTH + 'px';
+              _this10.isCanRemoveTag = false;
+              _this10.filterData(value);
+              _this10.$refs.input.style.width = charLen * _this10.INPUT_MIN_WIDTH + 'px';
             } else {
-              _this9.isCanRemoveTag = true;
-              if (_this9.trigger === 'focus') {
-                _this9.filterData();
+              _this10.isCanRemoveTag = true;
+              if (_this10.trigger === 'focus') {
+                _this10.filterData();
               }
             }
           } else {
-            _this9.handleBlur();
-            _this9.curInputValue = '';
-            _this9.showList = false;
+            _this10.handleBlur();
+            _this10.curInputValue = '';
+            _this10.showList = false;
           }
-          _this9.isEdit = true;
-          _this9.focusItemIndex = _this9.allowCreate ? -1 : 0;
+          _this10.isEdit = true;
+          _this10.focusItemIndex = _this10.allowCreate ? -1 : 0;
         });
       },
       handleFocus: function handleFocus(event) {
@@ -5848,7 +5860,7 @@
         this.$emit('focus', this.tagList);
       },
       handlePaste: function handlePaste(event) {
-        var _this10 = this;
+        var _this11 = this;
         if (this.isSingleSelect) {
           return false;
         }
@@ -5863,7 +5875,7 @@
         var valArr = this.pasteFn ? this.pasteFn(value) : this.defaultPasteFn(value);
         var tags = [];
         valArr.map(function (val) {
-          return tags.push(val[_this10.saveKey]);
+          return tags.push(val[_this11.saveKey]);
         });
         if (tags.length) {
           var nodes = this.$refs.tagList.childNodes;
@@ -5871,10 +5883,10 @@
           var localTags = [];
           var localInitDara = [];
           this.initData.map(function (data) {
-            localInitDara.push(data[_this10.saveKey]);
+            localInitDara.push(data[_this11.saveKey]);
           });
           tags = tags.filter(function (tag) {
-            return tag && tag.trim() && !_this10.tagList.includes(tag) && localInitDara.includes(tag);
+            return tag && tag.trim() && !_this11.tagList.includes(tag) && localInitDara.includes(tag);
           });
           if (this.maxData !== -1) {
             if (this.tagList.length < this.maxData) {
@@ -5888,8 +5900,8 @@
           }
           tags.map(function (tag) {
             var temp = {};
-            temp[_this10.saveKey] = tag;
-            temp[_this10.displayKey] = tag;
+            temp[_this11.saveKey] = tag;
+            temp[_this11.displayKey] = tag;
             localTags.push(temp);
           });
           if (tags.length) {
@@ -5901,36 +5913,36 @@
             this.focusInputer();
             this.$refs.input.style.width = this.INPUT_MIN_WIDTH + 'px';
             this.initData = this.initData.filter(function (val) {
-              return !tags.includes(val[_this10.saveKey]);
+              return !tags.includes(val[_this11.saveKey]);
             });
             this.handlerChange('select');
           }
         }
       },
       defaultPasteFn: function defaultPasteFn(val) {
-        var _this11 = this;
+        var _this12 = this;
         var target = [];
         var textArr = val.split(';');
         textArr.map(function (item) {
           if (item.match(/^[a-zA-Z][a-zA-Z_]+/g)) {
             var finalItem = item.match(/^[a-zA-Z][a-zA-Z_]+/g).join('');
             var temp = {};
-            temp[_this11.saveKey] = finalItem;
-            temp[_this11.displayKey] = finalItem;
+            temp[_this12.saveKey] = finalItem;
+            temp[_this12.displayKey] = finalItem;
             target.push(temp);
           }
         });
         return target;
       },
       updateScrollTop: function updateScrollTop() {
-        var _this12 = this;
+        var _this13 = this;
         var panelObj = this.$refs.selectorList;
         var panelInfo = {
           height: panelObj.clientHeight,
           yAxis: panelObj.getBoundingClientRect().y
         };
         this.$nextTick(function () {
-          var activeObj = _this12.$refs.selectorList.querySelector('.bk-selector-actived');
+          var activeObj = _this13.$refs.selectorList.querySelector('.bk-selector-actived');
           if (!activeObj) {
             return;
           }
@@ -6042,7 +6054,7 @@
         this.showList = false;
       },
       backspaceHandler: function backspaceHandler(index, target) {
-        var _this13 = this;
+        var _this14 = this;
         if (!this.curInputValue) {
           if (this.isCanRemoveTag) {
             this.tagList.splice(index - 1, 1);
@@ -6055,7 +6067,7 @@
             this.focusInputer();
             var localList = this.useGroup ? this.allList : this.list;
             var isExistInit = localList.some(function (item) {
-              return item === target[_this13.saveKey];
+              return item === target[_this14.saveKey];
             });
             if ((this.allowCreate && isExistInit || !this.allowCreate) && !this.isSingleSelect) {
               this.initData.push(target);
@@ -6073,19 +6085,19 @@
         this.handlerChange('remove');
       },
       removeTag: function removeTag(data, index) {
-        var _this14 = this;
+        var _this15 = this;
         this.tagList.splice(index, 1);
         this.localTagList.splice(index, 1);
         var localList = this.useGroup ? this.allList : this.list;
         var isExistInit = localList.some(function (item) {
-          return item === data[_this14.saveKey];
+          return item === data[_this15.saveKey];
         });
         if ((this.allowCreate && isExistInit || !this.allowCreate) && !this.isSingleSelect) {
           this.initData.push(data);
         }
       },
       addTag: function addTag(item, type) {
-        var _this15 = this;
+        var _this16 = this;
         var nodes = this.$refs.tagList.childNodes;
         var result = this.getSiteInfo();
         var isSelected = false;
@@ -6096,13 +6108,13 @@
             var localTags = [];
             tags = item.split(this.separator);
             tags = tags.filter(function (tag) {
-              var validate = typeof _this15.createTagValidator === 'function' ? _this15.createTagValidator(tag) : true;
-              return tag && tag.trim() && !_this15.tagList.includes(tag) && validate;
+              var validate = typeof _this16.createTagValidator === 'function' ? _this16.createTagValidator(tag) : true;
+              return tag && tag.trim() && !_this16.tagList.includes(tag) && validate;
             });
             tags.forEach(function (tag) {
               var temp = {};
-              temp[_this15.saveKey] = tag;
-              temp[_this15.displayKey] = tag;
+              temp[_this16.saveKey] = tag;
+              temp[_this16.displayKey] = tag;
               localTags.push(temp);
             });
             if (tags.length) {
@@ -6147,14 +6159,14 @@
         if (isSelected) {
           this.$nextTick(function () {
             var site = nodes[_parseInt$2(result.index, 10) + 1];
-            _this15.insertAfter(_this15.$refs.staffInput, site);
-            _this15.$refs.input.style.width = _this15.INPUT_MIN_WIDTH + 'px';
-            if (!_this15.isSingleSelect && _this15.allowNextFocus) {
-              _this15.focusInputer();
+            _this16.insertAfter(_this16.$refs.staffInput, site);
+            _this16.$refs.input.style.width = _this16.INPUT_MIN_WIDTH + 'px';
+            if (!_this16.isSingleSelect && _this16.allowNextFocus) {
+              _this16.focusInputer();
             }
-            if (!_this15.isSingleSelect) {
-              _this15.initData = _this15.initData.filter(function (val) {
-                return !_this15.tagList.includes(val[_this15.saveKey]);
+            if (!_this16.isSingleSelect) {
+              _this16.initData = _this16.initData.filter(function (val) {
+                return !_this16.tagList.includes(val[_this16.saveKey]);
               });
             }
           });
@@ -6172,35 +6184,35 @@
         this.cacheVal = '';
       },
       handleBlur: function handleBlur(inputValue) {
-        var _this16 = this;
+        var _this17 = this;
         this.timer = setTimeout(function () {
-          var inputValue = _this16.curInputValue;
-          _this16.clearInput();
-          _this16.dispatch('bk-form-item', 'form-blur');
-          _this16.isEdit = false;
-          if (_this16.isSingleSelect) {
-            var _this16$tagListCache = _slicedToArray(_this16.tagListCache, 1),
-              oldVal = _this16$tagListCache[0];
-            if (inputValue && inputValue === oldVal && _this16.localTagListCache.length) {
-              _this16.addTag(_this16.localTagListCache[0], 'select');
+          var inputValue = _this17.curInputValue;
+          _this17.clearInput();
+          _this17.dispatch('bk-form-item', 'form-blur');
+          _this17.isEdit = false;
+          if (_this17.isSingleSelect) {
+            var _this17$tagListCache = _slicedToArray(_this17.tagListCache, 1),
+              oldVal = _this17$tagListCache[0];
+            if (inputValue && inputValue === oldVal && _this17.localTagListCache.length) {
+              _this17.addTag(_this17.localTagListCache[0], 'select');
             } else {
-              _this16.handlerChange('remove');
+              _this17.handlerChange('remove');
             }
-          } else if (_this16.allowAutoMatch && inputValue) {
-            var matchItem = _this16.renderList.find(function (item) {
-              return item[_this16.searchKey] === inputValue;
+          } else if (_this17.allowAutoMatch && inputValue) {
+            var matchItem = _this17.renderList.find(function (item) {
+              return item[_this17.searchKey] === inputValue;
             });
             if (matchItem) {
-              _this16.handlerResultSelect(matchItem, 'select');
-            } else if (_this16.allowCreate) {
-              _this16.handlerResultSelect(inputValue, 'custom');
+              _this17.handlerResultSelect(matchItem, 'select');
+            } else if (_this17.allowCreate) {
+              _this17.handlerResultSelect(inputValue, 'custom');
             }
           }
-          _this16.$emit('blur', inputValue, _this16.tagList);
+          _this17.$emit('blur', inputValue, _this17.tagList);
         }, 200);
       },
       focusInputer: function focusInputer(event) {
-        var _this17 = this;
+        var _this18 = this;
         if (this.disabled) {
           return;
         }
@@ -6225,11 +6237,11 @@
         }
         this.isEdit = true;
         this.$nextTick(function () {
-          _this17.$refs.input.focus();
-          if (_this17.trigger === 'focus') {
-            _this17.showList = true;
-            _this17.filterData();
-            _this17.showPopover();
+          _this18.$refs.input.focus();
+          if (_this18.trigger === 'focus') {
+            _this18.showList = true;
+            _this18.filterData();
+            _this18.showPopover();
           }
         });
       },
@@ -6347,6 +6359,14 @@
         }
       }) : _vm._e()], 1);
     }), _vm.enableCollapseTags && _vm.localTagList.length > _vm.overflowTagIndex ? _c('li', {
+      directives: [{
+        name: "bk-tooltips",
+        rawName: "v-bk-tooltips",
+        value: {
+          content: _vm.collapseTooltip.join(', ')
+        },
+        expression: "{ content: collapseTooltip.join(', ') }"
+      }],
       staticClass: "key-node"
     }, [_c('div', {
       staticClass: "tag"

package/lib/time-picker.js

@@ -2738,7 +2738,7 @@
       if (this.shortcutSelectedIndex !== -1) {
         shortcut = this.shortcuts[this.shortcutSelectedIndex] || null;
         if (shortcut) {
-          initialValue = shortcut.value();
+          initialValue = [shortcut.value()];
         }
       }
       var focusedTime = initialValue.map(extractTime);

package/lib/timeline.js

@@ -97,8 +97,16 @@
     components: {
       vnodeIcon: {
         functional: true,
-        render: function render(h, ctx) {
-          return ctx.props.icon;
+        render: function render(_, _ref) {
+          var props = _ref.props;
+          return props.icon;
+        }
+      },
+      ContentVnode: {
+        functional: true,
+        render: function render(_, _ref2) {
+          var props = _ref2.props;
+          return props.content;
         }
       }
     },
@@ -126,9 +134,9 @@
         this.$emit('select', item);
       },
       makeClass: function makeClass(item) {
-        var _ref;
+        var _ref3;
         var classPrefix = 'bk-timeline-item-';
-        var classNames = [(_ref = {}, _defineProperty(_ref, "".concat(classPrefix, "filled"), item.filled), _defineProperty(_ref, "".concat(classPrefix, "custom-icon"), this.isCustomIcon(item.icon)), _ref)];
+        var classNames = [(_ref3 = {}, _defineProperty(_ref3, "".concat(classPrefix, "filled"), item.filled), _defineProperty(_ref3, "".concat(classPrefix, "custom-icon"), this.isCustomIcon(item.icon)), _ref3)];
         var dotColors = ['blue', 'red', 'green', 'yellow', 'gray'];
         if (item.size) {
           classNames.push("".concat(classPrefix).concat(item.size));
@@ -148,9 +156,6 @@
           return false;
         }
       },
-      nodeContent: function nodeContent(data, index) {
-        this.$slots["nodeContent".concat(index)] = [data.content];
-      },
       isBuiltinIcon: function isBuiltinIcon(icon) {
         return typeof icon === 'string';
       },
@@ -268,16 +273,20 @@
         }) : _vm._e()];
       }, null, item), item.content ? _c('div', {
         staticClass: "bk-timeline-content"
-      }, [_vm.isNode(item) ? [_vm._t('nodeContent' + index, function () {
-        return [_vm._v(_vm._s(_vm.nodeContent(item, index)))];
-      })] : [_c('div', {
-        attrs: {
-          "title": _vm.computedTitle(item.content)
-        },
-        domProps: {
-          "innerHTML": _vm._s(item.content)
-        }
-      })]], 2) : _vm._e()], 2)]);
+      }, [_vm._t("nodeContent" + index, function () {
+        return [_vm.isNode(item) ? [_c('content-vnode', {
+          attrs: {
+            "content": item.content
+          }
+        })] : [_c('div', {
+          attrs: {
+            "title": _vm.computedTitle(item.content)
+          },
+          domProps: {
+            "innerHTML": _vm._s(item.content)
+          }
+        })]];
+      }, null, item)], 2) : _vm._e()], 2)]);
     }), 0);
   };
   var __vue_staticRenderFns__ = [];