fix: DEFECT-1547 租户首次登录的时候，新密码和确认密码输入一致，然后确认密码修改，提示两次密码输入不一样，然后再把新密码改为跟确认密码一致后，还是提示此信息

@@ -5,14 +5,26 @@ export const formSchema: FormSchema[] = [
     field: 'passwordOld',
     field: 'passwordOld',
     label: '当前密码',
     label: '当前密码',
     component: 'InputPassword',
     component: 'InputPassword',
+    componentProps: {
+      placeholder: '请输入当前密码',
+    },
     required: true,
     required: true,
   },
   },
   {
   {
     field: 'passwordNew',
     field: 'passwordNew',
     label: '新密码',
     label: '新密码',
-    component: 'StrengthMeter',
-    componentProps: {
-      placeholder: '新密码',
+    component: 'InputPassword',
+    componentProps({ formModel, formActionType }) {
+      return {
+        placeholder: '请输入新密码',
+        onInput({ target }) {
+          const { value } = target;
+          const { confirmPassword } = formModel;
+          if (value === confirmPassword) {
+            formActionType.clearValidate('confirmPassword');
+          }
+        },
+      };
     },
     },
     rules: [
     rules: [
       {
       {
@@ -25,7 +37,9 @@ export const formSchema: FormSchema[] = [
     field: 'confirmPassword',
     field: 'confirmPassword',
     label: '确认密码',
     label: '确认密码',
     component: 'InputPassword',
     component: 'InputPassword',
-
+    componentProps: {
+      placeholder: '请输入确认密码',
+    },
     dynamicRules: ({ values }) => {
     dynamicRules: ({ values }) => {
       return [
       return [
         {
         {
@@ -37,7 +51,6 @@ export const formSchema: FormSchema[] = [
             if (value !== values.passwordNew) {
             if (value !== values.passwordNew) {
               return Promise.reject('两次输入的密码不一致!');
               return Promise.reject('两次输入的密码不一致!');
             }
             }
-
             const pwdRegex = new RegExp(InputRegExp.PASSWORD_INPUT);
             const pwdRegex = new RegExp(InputRegExp.PASSWORD_INPUT);
             if (!pwdRegex.test(value)) {
             if (!pwdRegex.test(value)) {
               return Promise.reject(
               return Promise.reject(