fix(cdk:forms): interactions trigger dosen't work (#1770)

IDuxFE · Jan 2, 2024 · fc44cbf · fc44cbf
1 parent e216b08
commit fc44cbf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/cdk/forms/src/models/abstractControl.ts b/packages/cdk/forms/src/models/abstractControl.ts
@@ -684,7 +684,7 @@ export abstract class AbstractControl<T = any> {
       }
 
       if (this.trigger === 'interactions') {
-        if ((!this.valid.value || !!oldValue) && !isChanging) {
+        if (((this.validated.value && !this.valid.value) || !!oldValue) && !isChanging) {
           isChangeValidating = true
         }
 
@@ -693,7 +693,9 @@ export abstract class AbstractControl<T = any> {
         }
       }
 
-      isChanging = true
+      if (this.dirty.value) {
+        isChanging = true
+      }
     })
   }
 }
diff --git a/packages/components/form/demo/InteractionsTrigger.vue b/packages/components/form/demo/InteractionsTrigger.vue
@@ -1,9 +1,9 @@
 <template>
   <IxForm class="demo-form" :control="formGroup">
-    <IxFormItem message="Please input your username!">
+    <IxFormItem>
       <IxInput control="username" prefix="user"></IxInput>
     </IxFormItem>
-    <IxFormItem message="Please input your password, its length is 6-18!">
+    <IxFormItem>
       <IxInput control="password" prefix="lock" :type="passwordVisible ? 'text' : 'password'">
         <template #suffix>
           <IxIcon :name="passwordVisible ? 'eye-invisible' : 'eye'" @click="passwordVisible = !passwordVisible">
@@ -37,7 +37,7 @@ const { required, minLength, maxLength } = Validators
 
 const formGroup = useFormGroup(
   {
-    username: ['', required],
+    username: ['', maxLength(10)],
     password: ['', [required, minLength(6), maxLength(18)]],
     remember: [true],
   },