fixed: 新密码不如入不提示的问题.

orion-ops-ui/src/views/asset/host-identity/components/host-identity-form-modal.vue

@@ -31,7 +31,8 @@
         <!-- 用户密码 -->
         <a-form-item field="password"
                      label="用户密码"
-                     style="justify-content: space-between;">
+                     style="justify-content: space-between;"
+                     :rules="passwordRules">
           <a-input-password v-model="formModel.password"
                             :disabled="!isAddHandle && !formModel.useNewPassword"
                             :class="[isAddHandle ? 'password-input-full' : 'password-input']"
@@ -65,7 +66,7 @@
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
   import { createHostIdentity, updateHostIdentity, HostIdentityUpdateRequest } from '@/api/asset/host-identity';
-  import { Message } from '@arco-design/web-vue';
+  import { FieldRule, Message } from '@arco-design/web-vue';
   import HostKeySelector from '@/components/asset/host-key/host-key-selector.vue';
 
   const { visible, setVisible } = useVisible();
@@ -113,6 +114,20 @@
 
   defineExpose({ openAdd, openUpdate });
 
+  // 密码验证
+  const passwordRules = [{
+    validator: (value, cb) => {
+      if (value && value.length > 512) {
+        cb('密码长度不能大于512位');
+        return;
+      }
+      if (formModel.value.useNewPassword && !value) {
+        cb('请输入密码');
+        return;
+      }
+    }
+  }] as FieldRule[];
+
   // 确定
   const handlerOk = async () => {
     setLoading(true);

orion-ops-ui/src/views/asset/host-identity/types/form.rules.ts

@@ -16,13 +16,7 @@ export const username = [{
   message: '用户名长度不能大于128位'
 }] as FieldRule[];
 
-export const password = [{
-  maxLength: 512,
-  message: '用户密码长度不能大于512位'
-}] as FieldRule[];
-
 export default {
   name,
   username,
-  password,
 } as Record<string, FieldRule | FieldRule[]>;

orion-ops-ui/src/views/asset/host-key/components/host-key-form-drawer.vue

@@ -62,7 +62,8 @@
         <a-form-item v-if="!isViewHandler"
                      field="password"
                      label="密码"
-                     style="justify-content: space-between;">
+                     style="justify-content: space-between;"
+                     :rules="passwordRules">
           <a-input-password v-model="formModel.password"
                             :disabled="!isAddHandle && !formModel.useNewPassword"
                             :class="[isAddHandle ? 'password-input-full' : 'password-input']"
@@ -93,7 +94,7 @@
   import useVisible from '@/hooks/visible';
   import formRules from '../types/form.rules';
   import { createHostKey, updateHostKey, getHostKey, HostKeyUpdateRequest } from '@/api/asset/host-key';
-  import { FileItem, Message } from '@arco-design/web-vue';
+  import { FieldRule, FileItem, Message } from '@arco-design/web-vue';
   import { readFileText } from '@/utils/file';
 
   const { visible, setVisible } = useVisible();
@@ -165,6 +166,20 @@
 
   defineExpose({ openAdd, openUpdate, openView });
 
+  // 密码验证
+  const passwordRules = [{
+    validator: (value, cb) => {
+      if (value && value.length > 512) {
+        cb('密码长度不能大于512位');
+        return;
+      }
+      if (formModel.value.useNewPassword && !value) {
+        cb('请输入密码');
+        return;
+      }
+    }
+  }] as FieldRule[];
+
   // 选择公钥文件
   const selectPublicFile = async (fileList: FileItem[]) => {
     formModel.value.publicKey = await readFileText(fileList[0].file as File);

orion-ops-ui/src/views/asset/host-key/types/form.rules.ts

@@ -13,13 +13,7 @@ export const privateKey = [{
   message: '请输入私钥文本'
 }] as FieldRule[];
 
-export const password = [{
-  maxLength: 512,
-  message: '密码长度不能大于512位'
-}] as FieldRule[];
-
 export default {
   name,
   privateKey,
-  password,
 } as Record<string, FieldRule | FieldRule[]>;

orion-ops-ui/src/views/asset/host/components/host-config-ssh-form.vue

@@ -248,7 +248,7 @@
       const { data } = await updateHostConfig({
         id: props?.content?.id,
         version: config.value.version,
-        config: JSON.stringify(formModel)
+        config: JSON.stringify(formModel.value)
       });
       config.value.version = data;
       setLoading(false);