From 26b7205344ef64c04ac7555121fa35bf14d3cb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A8=81?= <we1025@qq.com>
Date: Sat, 16 Sep 2023 23:42:57 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86group=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=9C=A8render=E4=B8=AD=E6=9C=AA=E5=BC=95=E7=94=A8val?=
 =?UTF-8?q?ue=E5=AF=BC=E8=87=B4value=E6=9B=B4=E6=96=B0=E5=90=8Erende?=
 =?UTF-8?q?=E4=B8=8D=E6=89=A7=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/checkboxgroup/checkboxgroup.vue | 35 +++++++-------------
 src/packages/checkboxgroup/demo.vue          | 35 ++++++++++++++------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/src/packages/checkboxgroup/checkboxgroup.vue b/src/packages/checkboxgroup/checkboxgroup.vue
index 4c7169fac0..408af2a358 100644
--- a/src/packages/checkboxgroup/checkboxgroup.vue
+++ b/src/packages/checkboxgroup/checkboxgroup.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class="['nut-checkboxgroup', { vertical: vertical }, customClass]">
-    <div class="checkbox-item" v-for="(item, index) in checkBoxData" :key="item[keys.id]">
+    <div class="checkbox-item" v-for="(item, index) in list" :key="item[keys.id]">
       <nut-checkbox
         :name="name || item[keys.name]"
         :disabled="disabled || item[keys.disabled]"
@@ -9,7 +9,7 @@
         :size="item.size ? item.size : size"
         :id="item[keys.id]"
         :checked.sync="item.checked"
-        v-model="checkboxValues[item[keys.id]]"
+        :value="item.checked"
         @change="changeEvt(arguments, item)"
         >{{ item[keys.label] || item[keys.value] || item }}
       </nut-checkbox>
@@ -73,33 +73,22 @@ export default {
   data() {
     return {
       ignoreChange: false,
-      checkboxValues: {},
-      initialValue: [],
     };
   },
   components: {
     [nutcheckbox.name]: nutcheckbox,
   },
-  watch: {
-    value() {
-      this.init();
-    },
-    checkBoxData() {
-      this.init();
-    },
-  },
-  mounted() {
-    this.init();
-  },
-  methods: {
-    init() {
-      this.initialValue = this.value;
-      this.checkBoxData.map((item) => {
+  computed: {
+    list() {
+      return this.checkBoxData.map((item) => {
         if (typeof item === 'object') {
           item.checked = this.isOptionCheckedByDefault(item);
         }
+        return item;
       });
     },
+  },
+  methods: {
     isObject(obj) {
       return obj !== null && typeof obj === 'object';
     },
@@ -113,7 +102,7 @@ export default {
       return -1;
     },
     isOptionCheckedByDefault(item) {
-      return this.looseIndexOf(this.initialValue, item[this.keys.value] || item) > -1;
+      return this.looseIndexOf(this.value, item[this.keys.value] || item) > -1;
     },
     looseEqual(a, b) {
       return a == b || (this.isObject(a) && this.isObject(b) ? JSON.stringify(a) === JSON.stringify(b) : false);
@@ -153,19 +142,19 @@ export default {
         return;
       }
       if (checked === true) {
-        this.checkBoxData.map((item) => {
+        this.list.map((item) => {
           item.checked = true;
         });
       }
       if (!checked) {
-        this.checkBoxData.map((item) => {
+        this.list.map((item) => {
           item.checked = !item.checked;
         });
       }
 
       let value = [],
         label = [];
-      let resData = this.checkBoxData.filter((item) => {
+      let resData = this.list.filter((item) => {
         if (item.checked) {
           value.push(item.value);
           label.push(item.label);
diff --git a/src/packages/checkboxgroup/demo.vue b/src/packages/checkboxgroup/demo.vue
index cd3550427e..f0ec5f2e4f 100644
--- a/src/packages/checkboxgroup/demo.vue
+++ b/src/packages/checkboxgroup/demo.vue
@@ -5,10 +5,18 @@
       <nut-cell>
         <span slot="title"><nut-checkboxgroup ref="checkboxGroup" :checkBoxData="data1" v-model="group1"></nut-checkboxgroup></span>
       </nut-cell>
-      <p>{{ group1 }}</p>
       <nut-button small @click="checkAll(true)">全选</nut-button>
       <nut-button small @click="checkAll(false)">取消全选</nut-button>
       <nut-button small @click="checkAll()">反选</nut-button>
+      <nut-button
+        small
+        @click="
+          data8 = data1;
+          data1 = [...data11];
+        "
+        >修改list</nut-button
+      >
+      <nut-button small @click="data1 = [...data8]">返回</nut-button>
     </div>
 
     <h4>禁用状态</h4>
@@ -84,34 +92,41 @@ export default {
         { id: 11, value: '选项A', label: '选项A' },
         { id: 12, value: '选项B', label: '选项B' },
         { id: 13, value: '选项C', label: '选项C' },
-        { id: 14, value: '选项D', label: '选项D' }
+        { id: 14, value: '选项D', label: '选项D' },
+      ],
+      data11: [
+        { id: 111, value: '选项A1', label: '选项A1' },
+        { id: 121, value: '选项B1', label: '选项B1' },
+        { id: 131, value: '选项C1', label: '选项C1' },
+        { id: 141, value: '选项D1', label: '选项D1' },
       ],
       data2: [
         { id: 21, value: '选项1', label: '选项1', disabled: true },
-        { id: 22, value: '选项2', label: '选项2', disabled: true }
+        { id: 22, value: '选项2', label: '选项2', disabled: true },
       ],
       data3: [{ id: 31, value: '备选项', label: '备选项' }],
       data33: [{ id: 31, value: '备选项', label: '备选项', size: 'large' }],
       data4: [
         { id: 41, value: '选项1', label: '选项1' },
-        { id: 42, value: '选项2', label: '选项2' }
+        { id: 42, value: '选项2', label: '选项2' },
       ],
       data5: [
         { id: 51, value: 'A', label: '选项1' },
         { id: 52, value: 'B', label: '选项2' },
         { id: 53, value: 'C', label: '选项3' },
-        { id: 54, value: 'D', label: '选项4' }
+        { id: 54, value: 'D', label: '选项4' },
       ],
       data6: [
         { id: 51, value: '选项1', label: '选项1' },
         { id: 52, value: '选项2', label: '选项2' },
         { id: 53, value: '选项3', label: '选项3' },
-        { id: 54, value: '选项4', label: '选项4' }
+        { id: 54, value: '选项4', label: '选项4' },
       ],
       data7: [
         { id: 41, value: '选项1', label: '选项1' },
-        { id: 42, value: '选项2', label: '选项2' }
-      ]
+        { id: 42, value: '选项2', label: '选项2' },
+      ],
+      data8: [],
     };
   },
   mounted() {
@@ -126,8 +141,8 @@ export default {
     },
     checkAll(state) {
       this.$refs.checkboxGroup.toggleAll(state);
-    }
-  }
+    },
+  },
 };
 </script>
 

From 419cad18d0fa739dff9c4f48c3dd172af85f1bda Mon Sep 17 00:00:00 2001
From: liuwei1025 <we1025@qq.com>
Date: Mon, 18 Sep 2023 10:58:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E8=BF=98=E5=8E=9F=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/packages/checkboxgroup/demo.vue | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/packages/checkboxgroup/demo.vue b/src/packages/checkboxgroup/demo.vue
index f0ec5f2e4f..2402b82f5a 100644
--- a/src/packages/checkboxgroup/demo.vue
+++ b/src/packages/checkboxgroup/demo.vue
@@ -5,18 +5,10 @@
       <nut-cell>
         <span slot="title"><nut-checkboxgroup ref="checkboxGroup" :checkBoxData="data1" v-model="group1"></nut-checkboxgroup></span>
       </nut-cell>
+      <p>{{ group1 }}</p>
       <nut-button small @click="checkAll(true)">全选</nut-button>
       <nut-button small @click="checkAll(false)">取消全选</nut-button>
       <nut-button small @click="checkAll()">反选</nut-button>
-      <nut-button
-        small
-        @click="
-          data8 = data1;
-          data1 = [...data11];
-        "
-        >修改list</nut-button
-      >
-      <nut-button small @click="data1 = [...data8]">返回</nut-button>
     </div>
 
     <h4>禁用状态</h4>
@@ -94,12 +86,6 @@ export default {
         { id: 13, value: '选项C', label: '选项C' },
         { id: 14, value: '选项D', label: '选项D' },
       ],
-      data11: [
-        { id: 111, value: '选项A1', label: '选项A1' },
-        { id: 121, value: '选项B1', label: '选项B1' },
-        { id: 131, value: '选项C1', label: '选项C1' },
-        { id: 141, value: '选项D1', label: '选项D1' },
-      ],
       data2: [
         { id: 21, value: '选项1', label: '选项1', disabled: true },
         { id: 22, value: '选项2', label: '选项2', disabled: true },
@@ -126,7 +112,6 @@ export default {
         { id: 41, value: '选项1', label: '选项1' },
         { id: 42, value: '选项2', label: '选项2' },
       ],
-      data8: [],
     };
   },
   mounted() {