[Update] Merge

src/components/DetailCard/ItemValue.vue

@@ -12,9 +12,8 @@ export default {
     },
     callback: {
       type: Function,
-      default: () => ({})
+      default: null
     }
-
   },
   render(h) {
     if (typeof this.callback === 'function') {

src/components/DetailCard/index.vue

@@ -1,8 +1,8 @@
 <template>
   <IBox :title="title" fa="fa-info-circle">
     <div class="content">
-      <el-row v-for="item in items" :key="'card-' + item.key" class="item" :gutter="10">
+      <el-row v-for="item in items" :key="'card-' + item.key" :gutter="10" class="item">
-        <el-col :span="6"><div class="item-label" :style="{ 'text-align': align }"><label>{{ item.key }}: </label></div></el-col>
+        <el-col :span="6"><div :style="{ 'text-align': align }" class="item-label"><label>{{ item.key }}: </label></div></el-col>
         <el-col :span="18"><div class="item-text">
           <ItemValue :value="item.value" :item="item" :callback="item.callback" />
         </div></el-col>

src/i18n/langs/cn.json

@@ -702,10 +702,10 @@
       },
       "resetMFAWarningMsg": "",
       "resetMFAdSuccessMsg": "",
-      "send": "",
+      "send": "发送",
-      "resetSSHKey": "",
+      "resetSSHKey": "重置SSH密钥",
-      "unblockUser": "",
+      "unblockUser": "解锁用户",
-      "unblock": ""
+      "unblock": "解锁"
     },
     "tabs": {
       "grantedAssets": "授权的资产",
@@ -715,13 +715,13 @@
       "grantedDatabases": "授权的数据库",
       "databasePermissionRules": "数据库授权规则"
     },
-    "resetPasswordWarningMsg": "",
+    "resetPasswordWarningMsg": "你确定要发送重置用户密码的邮件吗",
-    "resetPasswordSuccessMsg": "",
+    "resetPasswordSuccessMsg": "发送邮件任务已提交",
-    "resetSSHKeyWarningMsg": "",
+    "resetSSHKeyWarningMsg": "你确定要发送重置用户的SSH Key的邮件吗?",
-    "unblockSuccessMsg": "",
+    "unblockSuccessMsg": "解锁成功",
-    "removeWarningMsg": "",
+    "removeWarningMsg": "你确定移除 ",
-    "removeSuccessMsg": "",
+    "removeSuccessMsg": "移除成功",
-    "removeErrorMsg": ""
+    "removeErrorMsg": "移除失败"
   },
   "tree": {
     "AddNode": "",
@@ -750,9 +750,9 @@
   "Test": "",
   "Action": "",
   "delete": "",
-  "Update success": "",
+  "Update success": "更新重构",
-  "Update failed": "",
+  "Update failed": "更新失败",
-  "basic": "",
+  "basic": "基本",
   "协议组": "",
   "认证": "",
   "节点": "",

src/views/users/users/UserDetail/UserInfo.vue

@@ -246,7 +246,7 @@ export default {
     }
   },
   mounted() {
-    console.log(this.object)
+    console.log('Object is', this.object)
   },
   methods: {
   }