bk-magic-vue 2.4.0 → 2.4.1

package/lib/cascade.js

@@ -4931,6 +4931,7 @@
 	var script$1 = {
 	  name: 'bk-checkbox',
 	  mixins: [emitter],
+	  inject: ['handleRemoveItem', 'handleAddItem'],
 	  props: {
 	    value: {
 	      type: [String, Number, Boolean],
@@ -5010,9 +5011,16 @@
 	    }
 	  },
 	  created: function created() {
-	    this.dispatch('bk-checkbox-group', 'checkbox-item-add', this);
+	    if (this.handleAddItem && typeof this.handleAddItem === 'function') {
+	      this.handleAddItem(this);
+	    }
 	    this.init();
 	  },
+	  destroyed: function destroyed() {
+	    if (this.handleRemoveItem && typeof this.handleRemoveItem === 'function') {
+	      this.handleRemoveItem(this);
+	    }
+	  },
 	  methods: {
 	    getValue: function getValue() {
 	      if (this.selected) {
@@ -5255,7 +5263,9 @@
 	    class: {
 	      'bk-margin-left': _vm.multiple
 	    }
-	  }, [_vm._v("\n                    " + _vm._s(_vm.item.name) + "\n                    "), _vm._t("prepend", null, {
+	  }, [_vm._t("option", null, {
+	    node: _vm.item
+	  }), _vm._t("prepend", null, {
 	    node: _vm.item
 	  })], 2)])])], 2), _vm.isRemote ? [_vm.item.isLoading ? _c('i', {
 	    staticClass: "bk-icon left-icon icon-loading bk-button-icon-loading bk-cascade-right"
@@ -5604,6 +5614,14 @@
 	        }
 	      },
 	      scopedSlots: _vm._u([{
+	        key: "option",
+	        fn: function fn(ref) {
+	          var node = ref.node;
+	          return [_vm._t("option", null, {
+	            node: node
+	          })];
+	        }
+	      }, {
 	        key: "prepend",
 	        fn: function fn(ref) {
 	          var node = ref.node;
@@ -5635,6 +5653,14 @@
 	      "updateSelectedList": _vm.updateSelectedList
 	    },
 	    scopedSlots: _vm._u([{
+	      key: "option",
+	      fn: function fn(ref) {
+	        var node = ref.node;
+	        return [_vm._t("option", null, {
+	          node: node
+	        })];
+	      }
+	    }, {
 	      key: "prepend",
 	      fn: function fn(ref) {
 	        var node = ref.node;
@@ -6528,6 +6554,14 @@
 	      "updateSelectedList": _vm.updateSelectedList
 	    },
 	    scopedSlots: _vm._u([{
+	      key: "option",
+	      fn: function fn(ref) {
+	        var node = ref.node;
+	        return [_vm._t("option", [_vm._v(_vm._s(node.name))], {
+	          node: node
+	        })];
+	      }
+	    }, {
 	      key: "prepend",
 	      fn: function fn(ref) {
 	        var node = ref.node;

package/lib/checkbox-group.js

@@ -44,6 +44,12 @@
 
   var script = {
     name: 'bk-checkbox-group',
+    provide: function provide() {
+      return {
+        handleAddItem: this.handleAddItem,
+        handleRemoveItem: this.handleRemoveItem
+      };
+    },
     props: {
       value: {
         type: Array,
@@ -70,16 +76,17 @@
         this.localValue = _toConsumableArray(_value);
       }
     },
-    created: function created() {
-      var _this = this;
-      this.$on('checkbox-item-add', function (item) {
-        if (item) {
-          _this.checkboxItems.push(item);
-        }
-        return false;
-      });
-    },
     methods: {
+      handleAddItem: function handleAddItem(item) {
+        if (!item || this.checkboxItems.includes(item)) return;
+        this.checkboxItems.push(item);
+      },
+      handleRemoveItem: function handleRemoveItem(item) {
+        var index = this.checkboxItems.indexOf(item);
+        if (index > -1) {
+          this.checkboxItems.splice(index, 1);
+        }
+      },
       handleChange: function handleChange(checked, value) {
         var oldValue = _toConsumableArray(this.localValue);
         var localValue = [];

package/lib/checkbox.js

@@ -574,6 +574,7 @@
 	var script = {
 	  name: 'bk-checkbox',
 	  mixins: [emitter],
+	  inject: ['handleRemoveItem', 'handleAddItem'],
 	  props: {
 	    value: {
 	      type: [String, Number, Boolean],
@@ -653,9 +654,16 @@
 	    }
 	  },
 	  created: function created() {
-	    this.dispatch('bk-checkbox-group', 'checkbox-item-add', this);
+	    if (this.handleAddItem && typeof this.handleAddItem === 'function') {
+	      this.handleAddItem(this);
+	    }
 	    this.init();
 	  },
+	  destroyed: function destroyed() {
+	    if (this.handleRemoveItem && typeof this.handleRemoveItem === 'function') {
+	      this.handleRemoveItem(this);
+	    }
+	  },
 	  methods: {
 	    getValue: function getValue() {
 	      if (this.selected) {