diff --git a/openGauss-datakit/visualtool-ui/src/locale/locale/en.json b/openGauss-datakit/visualtool-ui/src/locale/locale/en.json index 4d3466f944f3c61467f3f96d9878944b28e8bcba..3812de00cc0d6ce5ced18485302f56f8421033ff 100644 --- a/openGauss-datakit/visualtool-ui/src/locale/locale/en.json +++ b/openGauss-datakit/visualtool-ui/src/locale/locale/en.json @@ -263,9 +263,10 @@ "5mphy3snyxc0": "Please enter a remark", "5mphy3snz5k0": "Adding a Dedicated Server", "5mphy3snzb80": "The current server is unavailable", - "5mphy3snzrk0": "Edit Host" + "5mphy3snzrk0": "Edit Host", + "noPasswordTip": "User password was not saved. Please add the user again." }, - "HostUserChoose":{ + "HostUserChoose": { "title": "Choose user", "tip": "There are currently multiple users, and there is no root user. Please select the user you want to log in to the terminal.", "userChoosePlaceholder": "Please choose a user" diff --git a/openGauss-datakit/visualtool-ui/src/locale/locale/zh-cn.json b/openGauss-datakit/visualtool-ui/src/locale/locale/zh-cn.json index 5326bdfcf77c74af785da8870a389c19e342f674..b617817acaf87ce467b6e17cfbd84b77904c1b28 100644 --- a/openGauss-datakit/visualtool-ui/src/locale/locale/zh-cn.json +++ b/openGauss-datakit/visualtool-ui/src/locale/locale/zh-cn.json @@ -263,9 +263,10 @@ "5mphy3snyxc0": "请输入备注", "5mphy3snz5k0": "新增物理机", "5mphy3snzb80": "当前服务器不可用", - "5mphy3snzrk0": "编辑物理机" + "5mphy3snzrk0": "编辑物理机", + "noPasswordTip": "未保存用户密码，请重新添加用户" }, - "HostUserChoose":{ + "HostUserChoose": { "title": "选择用户", "tip": "当前保存有多个用户，且无root用户，请选择登录终端的用户", "userChoosePlaceholder": "请选择用户" @@ -796,38 +797,38 @@ }, "bulk": { "BulkImport": { - "5exv06n8x1kh0": "批量导入", - "5exv06n8x1ki0": "选择文件", - "5exv06n8x1kj0": "将文件拖至此处 或", - "5exv06n8x1kk0": "文件解析", - "5exv06n8x1kl0": "导入到服务器", - "5exv06n8x1km0": "导入完成", - "5exv06n8x1kn0": "文件解析中，请稍等", - "5exv06n8x1ko0": "重新上传", - "5exv06n8x1kp0": "您仍可以通过拖拽文件到下方区域进行文件替换", - "5exv06n8x1kq0": "文件上传成功", - "5exv06n8x1kr0": "重新导入", - "5exv06n8x1ks0": "完成", - "5exv06n8x1kt0": "下载错误报告", - "5exv06n8x1ku0": "导入模板下载", - "5exv06n8x1kv0": "文件上传中", - "5exv06n8x1kx0": "文件解析失败", - "5exv06n8x1ky0": "仅支持上传Excel格式文件，大小不超过200MB", - "5exv06n8x1kz0": "删除", - "5exv06n8x1ka0": "确定", - "5exv06n8x1kb0": "取消", - "5exv06n8x1kw0": "文件上传失败，需上传Excel格式的文件，请重新上传", - "5exv06n8x1kc0": "文件上传失败，需上传200M以下文件，请重新上传", - "5exv06n8x1kd0": "文件上传失败，需上传单个文件，请重新上传", - "5exv06n8x1ke0": ",请修改文件并", - "5exv06n8x1kf0": "文件因为不明原因上传失败，请重新上传", - "5exv06n8x1kh1": "请不要刷新界面", - "5exv06n8x1ki1": "共导入", - "5exv06n8x1kj1": "条数据", - "5exv06n8x1kk1": "条", - "5exv06n8x1kl1": "导入成功，", - "5exv06n8x1km1": "导入失败", - "5exv06n8x1kn1": "下载错误报告" + "5exv06n8x1kh0": "批量导入", + "5exv06n8x1ki0": "选择文件", + "5exv06n8x1kj0": "将文件拖至此处 或", + "5exv06n8x1kk0": "文件解析", + "5exv06n8x1kl0": "导入到服务器", + "5exv06n8x1km0": "导入完成", + "5exv06n8x1kn0": "文件解析中，请稍等", + "5exv06n8x1ko0": "重新上传", + "5exv06n8x1kp0": "您仍可以通过拖拽文件到下方区域进行文件替换", + "5exv06n8x1kq0": "文件上传成功", + "5exv06n8x1kr0": "重新导入", + "5exv06n8x1ks0": "完成", + "5exv06n8x1kt0": "下载错误报告", + "5exv06n8x1ku0": "导入模板下载", + "5exv06n8x1kv0": "文件上传中", + "5exv06n8x1kx0": "文件解析失败", + "5exv06n8x1ky0": "仅支持上传Excel格式文件，大小不超过200MB", + "5exv06n8x1kz0": "删除", + "5exv06n8x1ka0": "确定", + "5exv06n8x1kb0": "取消", + "5exv06n8x1kw0": "文件上传失败，需上传Excel格式的文件，请重新上传", + "5exv06n8x1kc0": "文件上传失败，需上传200M以下文件，请重新上传", + "5exv06n8x1kd0": "文件上传失败，需上传单个文件，请重新上传", + "5exv06n8x1ke0": ",请修改文件并", + "5exv06n8x1kf0": "文件因为不明原因上传失败，请重新上传", + "5exv06n8x1kh1": "请不要刷新界面", + "5exv06n8x1ki1": "共导入", + "5exv06n8x1kj1": "条数据", + "5exv06n8x1kk1": "条", + "5exv06n8x1kl1": "导入成功，", + "5exv06n8x1km1": "导入失败", + "5exv06n8x1kn1": "下载错误报告" } }, "az": { diff --git a/openGauss-datakit/visualtool-ui/src/views/resource/physical/components/AddHost.vue b/openGauss-datakit/visualtool-ui/src/views/resource/physical/components/AddHost.vue index 52c8b475922de49a003e887c8429a9c1ce038dd0..146241f71f0c3270a32d72a646f8d875409f1d07 100644 --- a/openGauss-datakit/visualtool-ui/src/views/resource/physical/components/AddHost.vue +++ b/openGauss-datakit/visualtool-ui/src/views/resource/physical/components/AddHost.vue @@ -101,6 +101,7 @@ const data = reactive({ publicIp: '', port: 22, password: '', + username: '', isRemember: true, tags: [], remark: '' @@ -184,9 +185,9 @@ const submit = () => { formRef.value?.validate().then(result => { if (!result) { data.loading = true - if (data.formData.hostId && data.formData.password === data.emptyPwd) { - const param = Object.assign({}, data.formData) - param.password = data.oldPwd + if (data.formData.hostId) { + const { privateIp, publicIp, port, remark, username, hostId, password, tags, name } = data.formData + const param = { privateIp, publicIp, port, remark, hostId, tags, name, password, username } editHost(data.formData.hostId, param).then((res: KeyValue) => { data.loading = false if (Number(res.code) === 200) { @@ -201,29 +202,16 @@ const submit = () => { encryptPassword(data.formData.password).then((res) => { const param = Object.assign({}, data.formData) param.password = res - if (data.formData.hostId) { - editHost(data.formData.hostId, param).then((res: KeyValue) => { - data.loading = false - if (Number(res.code) === 200) { - Message.success({ content: `Modified success` }) - emits(`finish`) - } - close() - }).finally(() => { - data.loading = false - }) - } else { - addHost(param).then((res: KeyValue) => { - data.loading = false - if (Number(res.code) === 200) { - Message.success({ content: `Create success` }) - emits(`finish`) - } - close() - }).finally(() => { - data.loading = false - }) - } + addHost(param).then((res: KeyValue) => { + data.loading = false + if (Number(res.code) === 200) { + Message.success({ content: `Create success` }) + emits(`finish`) + } + close() + }).finally(() => { + data.loading = false + }) }) } } @@ -232,6 +220,8 @@ const submit = () => { const close = () => { data.show = false data.oldPwd = '' + data.formData.password = ''; + data.formData.username = ''; nextTick(() => { formRef.value?.clearValidate() formRef.value?.resetFields() @@ -312,17 +302,21 @@ const getAllTag = () => { }) } -const getHostPassword = (hostId: string) => { - hostUserListAll(hostId).then((res: KeyValue) => { +const getHostPassword = async (hostId: string) => { + try { + const res: KeyValue = await hostUserListAll(hostId) if (Number(res.code) === 200) { - const rootObj = res.data.find((item: KeyValue) => { - return item.username === 'root' - }) - if (rootObj) { - data.oldPwd = rootObj.password - } - } - }) + const userEntity = res.data.find((e: any) => e && e.password); + if (userEntity) { + data.formData.username = userEntity.username; + data.formData.password = userEntity.password; + } else { + Message.error(t('components.AddHost.noPasswordTip')); + }; + }; + } catch (error) { + + } } const isAdd = ref(true) @@ -336,11 +330,7 @@ const open = (type: string, editData?: KeyValue) => { isAdd.value = false data.title = t('components.AddHost.5mphy3snzrk0') Object.assign(data.formData, editData) - if (data.formData.isRemember) { - data.formData.password = data.emptyPwd - // get password - getHostPassword(data.formData.hostId) - } + getHostPassword(data.formData.hostId) } else { data.title = t('components.AddHost.5mphy3snz5k0') Object.assign(data.formData, {