bk-magic-vue 2.4.13-beta.1 → 2.4.13

package/lib/option-group.js

@@ -1247,6 +1247,9 @@
 	      return !this.isSelectAllItems && !this.isEmpty;
 	    },
 	    isSelectAllItems: function isSelectAllItems() {
+	      if (this.options.length < 1) {
+	        return false;
+	      }
 	      return Array.prototype.every.call(this.options, function (option) {
 	        return option.isSelected;
 	      });

package/lib/transfer.js

@@ -4323,7 +4323,7 @@
       sortDataList: function sortDataList(list, key, sortList) {
         var arr = sortList;
         return list.sort(function (a, b) {
-          return arr.indexOf(a[key]) - arr.indexOf(b[key]) >= 0;
+          return arr.indexOf(a[key]) - arr.indexOf(b[key]);
         });
       },
       removeFromDataList: function removeFromDataList(removeItem) {
@@ -4338,6 +4338,7 @@
         var displayDataList = this.displayDataList;
         var hasSelectedList = this.hasSelectedList;
         displayDataList.forEach(function (transferItem) {
+          if (transferItem.disabled) return;
           hasSelectedList.push(transferItem);
           _this6.removeFromDataList(transferItem);
         });
@@ -4355,10 +4356,13 @@
       },
       allToLeft: function allToLeft() {
         this.rightHoverIndex = -1;
-        var hasSelectedList = this.hasSelectedList;
+        var hasSelectedList = this.hasSelectedList.filter(function (i) {
+          return !i.disabled;
+        });
         var dataList = this.dataList;
         while (hasSelectedList.length) {
           var transferItem = hasSelectedList.shift();
+          this.hasSelectedList.splice(this.hasSelectedList.indexOf(transferItem), 1);
           dataList.push(transferItem);
           if (this.sortList.length === this.sourceList.length) {
             this.dataList = _toConsumableArray(this.sortDataList(dataList, this.sortCode, this.sortList));
@@ -4373,7 +4377,8 @@
           this.$emit('change', this.dataList, this.hasSelectedList, list);
         }
       },
-      leftClick: function leftClick(index) {
+      leftClick: function leftClick(index, item) {
+        if (item.disabled) return;
         this.leftHoverIndex = -1;
         var transferItem = this.displayDataList[index];
         var hasSelectedList = this.hasSelectedList;
@@ -4391,7 +4396,8 @@
           this.$emit('change', this.dataList, this.hasSelectedList, list);
         }
       },
-      rightClick: function rightClick(index) {
+      rightClick: function rightClick(index, item) {
+        if (item.disabled) return;
         this.rightHoverIndex = -1;
         var transferItem = this.hasSelectedList.splice(index, 1)[0];
         var dataList = this.dataList;
@@ -4473,12 +4479,13 @@
     }, _vm._l(_vm.displayDataList, function (item, index) {
       return _c('li', {
         key: index,
+        class: [item.disabled ? 'is-disabled' : ''],
         on: {
           "click": function click($event) {
             $event.stopPropagation();
             $event.preventDefault();
 
-            _vm.leftClick(index);
+            _vm.leftClick(index, item);
           },
           "mouseover": function mouseover($event) {
             $event.stopPropagation();
@@ -4504,12 +4511,12 @@
         attrs: {
           "title": item[_vm.displayCode]
         }
-      }, [_vm._v(_vm._s(item[_vm.displayCode]))]), _c('span', {
+      }, [_vm._v(_vm._s(item[_vm.displayCode]))]), !item.disabled ? _c('span', {
         staticClass: "icon-wrapper",
         class: [index === _vm.leftHoverIndex ? 'hover' : '']
       }, [_c('i', {
         staticClass: "bk-icon icon-arrows-right"
-      })])], null, item)], 2);
+      })]) : _vm._e()], null, item)], 2);
     }), 0)] : [_vm.slot['left-empty-content'] ? _c('div', [_vm._t("left-empty-content")], 2) : _c('div', {
       staticClass: "empty"
     }, [_vm._v("\n        " + _vm._s(_vm.emptyContent[0] ? _vm.emptyContent[0] : _vm.t('bk.transfer.emptyContent')) + "\n      ")])]], 2), _c('div', {
@@ -4535,12 +4542,13 @@
     }, _vm._l(_vm.hasSelectedList, function (item, index) {
       return _c('li', {
         key: index,
+        class: [item.disabled ? 'is-disabled' : ''],
         on: {
           "click": function click($event) {
             $event.stopPropagation();
             $event.preventDefault();
 
-            _vm.rightClick(index);
+            _vm.rightClick(index, item);
           },
           "mouseover": function mouseover($event) {
             $event.stopPropagation();
@@ -4566,12 +4574,12 @@
         attrs: {
           "title": item[_vm.displayCode]
         }
-      }, [_vm._v(_vm._s(item[_vm.displayCode]))]), _c('span', {
+      }, [_vm._v(_vm._s(item[_vm.displayCode]))]), !item.disabled ? _c('span', {
         staticClass: "icon-wrapper",
         class: [index === _vm.rightHoverIndex ? 'hover' : '']
       }, [_c('i', {
         staticClass: "bk-icon icon-close"
-      })])], null, item)], 2);
+      })]) : _vm._e()], null, item)], 2);
     }), 0)] : [_vm.slot['right-empty-content'] ? _c('div', [_vm._t("right-empty-content")], 2) : _c('div', {
       staticClass: "empty"
     }, [_vm._v("\n        " + _vm._s(_vm.emptyContent[1] ? _vm.emptyContent[1] : _vm.t('bk.transfer.emptySelected')) + "\n      ")])]], 2)]);

package/lib/ui/bk-magic-vue.css

@@ -11895,6 +11895,11 @@ th.bk-table-column-selection .cell, th.bk-table-column-expand .cell, td.bk-table
                     background-color:#eef6fe;
                     color:#3a84ff;
                 }
+.bk-transfer .source-list .content li.is-disabled, .bk-transfer .target-list .content li.is-disabled{
+                    cursor:not-allowed;
+                    color:#c4c6cc;
+                    background-color:#fff;
+                }
 .bk-transfer .source-list .content li .content-text, .bk-transfer .target-list .content li .content-text{
                     -webkit-box-flex:1;
                         -ms-flex:1;