Merge remote-tracking branch 'origin/dev' into dev

frontend/src/business/components/settings/system/User.vue

@@ -53,19 +53,19 @@
                :destroy-on-close="true">
       <el-form :model="form" label-position="right" label-width="120px" size="small" :rules="rule" ref="createUserForm">
         <el-form-item label="ID" prop="id">
-          <el-input v-model="form.id" autocomplete="off"/>
+          <el-input v-model="form.id" autocomplete="off" :placeholder="$t('user.input_id')"/>
         </el-form-item>
         <el-form-item :label="$t('commons.username')" prop="name">
-          <el-input v-model="form.name" autocomplete="off"/>
+          <el-input v-model="form.name" autocomplete="off" :placeholder="$t('user.input_name')"/>
         </el-form-item>
         <el-form-item :label="$t('commons.email')" prop="email">
-          <el-input v-model="form.email" autocomplete="off"/>
+          <el-input v-model="form.email" autocomplete="off" :placeholder="$t('user.input_email')"/>
         </el-form-item>
         <el-form-item :label="$t('commons.phone')" prop="phone">
-          <el-input v-model="form.phone" autocomplete="off"/>
+          <el-input v-model="form.phone" autocomplete="off" :placeholder="$t('user.input_phone')"/>
         </el-form-item>
         <el-form-item :label="$t('commons.password')" prop="password">
-          <el-input v-model="form.password" autocomplete="off" show-password/>
+          <el-input v-model="form.password" autocomplete="new-password" show-password :placeholder="$t('user.input_password')"/>
         </el-form-item>
         <div v-for="(role, index) in form.roles" :key="index">
           <el-form-item :label="$t('commons.role')+index"

frontend/src/i18n/en-US.js

@@ -163,6 +163,7 @@ export default {
     'input_id': 'Please enter a ID',
     'input_email': 'Please enter a email',
     'input_password': 'Please enter a password',
+    'input_phone': 'Please enter phone number',
     'special_characters_are_not_supported': 'Special characters are not supported',
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',

frontend/src/i18n/zh-CN.js

@@ -161,6 +161,7 @@ export default {
     'input_id': '请输入ID',
     'input_email': '请输入邮箱',
     'input_password': '请输入密码',
+    'input_phone': '请输入电话号码',
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手机号码格式不正确',
     'email_format_is_incorrect': '邮箱格式不正确',

frontend/src/i18n/zh-TW.js

@@ -160,6 +160,7 @@ export default {
     'input_id': '請輸入ID',
     'input_email': '請輸入郵箱',
     'input_password': '請輸入密碼',
+    'input_phone': '請輸入電話號碼',
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手機號碼格式不正確',
     'email_format_is_incorrect': '郵箱格式不正確',