fix(comp:table): select all check state isn't displayed correctly (#1936

)
IDuxFE · Jun 11, 2024 · d1fb275 · d1fb275
1 parent 708f1f7
commit d1fb275
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/components/table/demo/EditRowValidator.vue b/packages/components/table/demo/EditRowValidator.vue
@@ -146,7 +146,7 @@ const createRecordGroup = (record: Data) => {
 
 const nameValidator = (value: string, control: AbstractControl): ValidateErrors | undefined => {
   const currentEditKey = control.parent?.get('key')?.getValue()
-  if(currentEditKey === undefined){
+  if (currentEditKey === undefined) {
     return undefined
   }
 
@@ -185,7 +185,7 @@ const nameValidator = (value: string, control: AbstractControl): ValidateErrors
 
 const sidValidator = (value: string, control: AbstractControl): ValidateErrors | undefined => {
   const gender = control.parent?.get('gender')?.getValue()
-  if(gender === undefined){
+  if (gender === undefined) {
     return undefined
   }
   console.log(`value is ${value}`)
@@ -246,7 +246,10 @@ const onSave = (record: Data) => {
       const copyData = [...data.value]
       const targetIndex = copyData.findIndex(item => item.key === record.key)
 
-      copyData.splice(targetIndex, 1, {...formValue, key: formValue.key.startsWith(addKeyPrefix) ? uniqueId('ADDED') : formValue.key})
+      copyData.splice(targetIndex, 1, {
+        ...formValue,
+        key: formValue.key.startsWith(addKeyPrefix) ? uniqueId('ADDED') : formValue.key,
+      })
       data.value = copyData
       success(`${formValue.name} saved successfully`)
       formGroup.removeControl(record.key as never)
@@ -316,7 +319,7 @@ const onSaveAll = () => {
         const result = newItem ? newItem : item
         return {
           ...result,
-          key: result.key.startsWith(addKeyPrefix) ? uniqueId('ADDED') : result.key
+          key: result.key.startsWith(addKeyPrefix) ? uniqueId('ADDED') : result.key,
         }
       })
       records.forEach(record => formGroup.removeControl(record.key as never))

diff --git a/packages/components/table/src/composables/useSelectable.ts b/packages/components/table/src/composables/useSelectable.ts
@@ -110,14 +110,17 @@ export function useSelectable(
       }
     }
 
+    if (!allSelected && !someSelected) {
+      checked = false
+    }
+
     return { checked, allSelected, someSelected }
   })
 
   // 当前页全选是否被勾选
   const currentPageAllSelected = computed(() => currentPageAllSelectState.value.checked)
 
   // 当前页是否部分被选中
-
   const currentPageSomeSelected = computed(
     () => !currentPageAllSelectState.value.allSelected && currentPageAllSelectState.value.someSelected,
   )