Merge pull request #604 from TaleLin/fix/checkbox

fix:修复checkbox最小选中数的bug(#601)

Author: 7insummer

dist/checkbox-group/index.js

@@ -40,8 +40,8 @@ Component({
 
     init(target) {
       if(this._keys === undefined) this._keys = {};
-      if(this._selected === undefined) this._selected = {};
-      this.checkDefaultItem(target);
+      // if(this._selected === undefined) this._selected = {};
+      // this.checkDefaultItem(target);
       this.checkedKeyRepeat(target);
     },
 
@@ -74,7 +74,7 @@ Component({
     },
 
     onEmitEventHandle(currentItem) {
-      currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
+      // currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
 
       this.triggerEvent('linchange', currentItem, {
         bubbles: true,
@@ -92,6 +92,14 @@ Component({
     },
     addSelect(key) {
       this._selected[key] = key;
+    },
+    _selected(){
+      const items = this.getRelationNodes('../checkbox/index');
+      let num = 0
+      items.map(item=> {
+        item.properties.checked ? num++ : '';
+      })
+      return num
     }
 
   }

dist/checkbox/index.js

@@ -98,7 +98,7 @@ Component({
 
       const limit = parent.properties[type];
       if (!limit) return false;
-      const selectedLength = Object.values(parent._selected).length;
+      const selectedLength = parent._selected();
       let isOverflow = type === 'minSelected' ? selectedLength <= limit : selectedLength >= limit;
       if (isOverflow) {
         let backType = type === 'minSelected' ? 'min_selected' : 'max_selected';

examples/dist/checkbox-group/index.js

@@ -40,8 +40,8 @@ Component({
 
     init(target) {
       if(this._keys === undefined) this._keys = {};
-      if(this._selected === undefined) this._selected = {};
-      this.checkDefaultItem(target);
+      // if(this._selected === undefined) this._selected = {};
+      // this.checkDefaultItem(target);
       this.checkedKeyRepeat(target);
     },
 
@@ -74,7 +74,7 @@ Component({
     },
 
     onEmitEventHandle(currentItem) {
-      currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
+      // currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
 
       this.triggerEvent('linchange', currentItem, {
         bubbles: true,
@@ -92,6 +92,14 @@ Component({
     },
     addSelect(key) {
       this._selected[key] = key;
+    },
+    _selected(){
+      const items = this.getRelationNodes('../checkbox/index');
+      let num = 0
+      items.map(item=> {
+        item.properties.checked ? num++ : '';
+      })
+      return num
     }
 
   }

examples/dist/checkbox/index.js

@@ -98,7 +98,7 @@ Component({
 
       const limit = parent.properties[type];
       if (!limit) return false;
-      const selectedLength = Object.values(parent._selected).length;
+      const selectedLength = parent._selected();
       let isOverflow = type === 'minSelected' ? selectedLength <= limit : selectedLength >= limit;
       if (isOverflow) {
         let backType = type === 'minSelected' ? 'min_selected' : 'max_selected';

src/checkbox-group/index.js

@@ -40,8 +40,8 @@ Component({
 
     init(target) {
       if(this._keys === undefined) this._keys = {};
-      if(this._selected === undefined) this._selected = {};
-      this.checkDefaultItem(target);
+      // if(this._selected === undefined) this._selected = {};
+      // this.checkDefaultItem(target);
       this.checkedKeyRepeat(target);
     },
 
@@ -74,7 +74,7 @@ Component({
     },
 
     onEmitEventHandle(currentItem) {
-      currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
+      // currentItem.checked ? this.addSelect(currentItem.key):this.removeSelect(currentItem.key);
 
       this.triggerEvent('linchange', currentItem, {
         bubbles: true,
@@ -92,6 +92,14 @@ Component({
     },
     addSelect(key) {
       this._selected[key] = key;
+    },
+    _selected(){
+      const items = this.getRelationNodes('../checkbox/index');
+      let num = 0
+      items.map(item=> {
+        item.properties.checked ? num++ : '';
+      })
+      return num
     }
 
   }

src/checkbox/index.js

@@ -98,7 +98,7 @@ Component({
 
       const limit = parent.properties[type];
       if (!limit) return false;
-      const selectedLength = Object.values(parent._selected).length;
+      const selectedLength = parent._selected();
       let isOverflow = type === 'minSelected' ? selectedLength <= limit : selectedLength >= limit;
       if (isOverflow) {
         let backType = type === 'minSelected' ? 'min_selected' : 'max_selected';