Merge pull request #866 from jumpserver/dev

v2.11.0 rc5

src/components/ListTable/TableAction/LeftSide.vue

@@ -32,7 +32,7 @@ export default {
       default: ''
     },
     createRoute: {
-      type: [String, Object],
+      type: [String, Object, Function],
       default: function() {
         return this.$route.name.replace('List', 'Create')
       }
@@ -149,10 +149,13 @@ export default {
   },
   methods: {
     handleCreate() {
-      let route = {}
+      let route
       if (typeof this.createRoute === 'string') {
+        route = { name: this.createRoute }
         route.name = this.createRoute
-      } else {
+      } else if (typeof this.createRoute === 'function') {
+        route = this.createRoute()
+      } else if (typeof this.createRoute === 'object') {
         route = this.createRoute
       }
       this.$router.push(route)

src/i18n/langs/cn.json

@@ -204,7 +204,8 @@
     "ipDomain": "IP(域名)",
     "HostProtocol": "主机协议",
     "DatabaseProtocol": "数据库协议",
-    "OtherProtocol": "其它协议"
+    "OtherProtocol": "其它协议",
+    "PasswordOrToken": "密码 / 令牌"
   },
   "audits": {
     "Hosts": "主机",

src/i18n/langs/en.json

@@ -203,7 +203,8 @@
     "ipDomain": "IP(Domain)",
     "HostProtocol": "Host Protocol",
     "DatabaseProtocol": "Database Protocol",
-    "OtherProtocol": "Other Protocol"
+    "OtherProtocol": "Other Protocol",
+    "PasswordOrToken": "Password / Token"
   },
   "audits": {
     "Hosts": "Host",

src/views/accounts/ApplicationAccount/ApplicationAccountList.vue

@@ -22,7 +22,7 @@
           <el-form-item :label="this.$t('assets.Username')">
             <el-input v-model="MFAInfo.username" disabled />
           </el-form-item>
-          <el-form-item :label="this.$t('assets.Password')">
+          <el-form-item :label="this.$t('assets.PasswordOrToken')">
             <el-input v-model="MFAInfo.password" type="password" show-password />
           </el-form-item>
         </el-form>
@@ -195,7 +195,11 @@ export default {
                         this.$axios.get(`/api/v1/assets/system-users/${this.MFAInfo.systemUser.id}/auth-info/`).then(res => {
                           this.MFAConfirmed = true
                           this.MFAInfo.username = res.username
-                          this.MFAInfo.password = res.password
+                          if (res.protocol === 'k8s') {
+                            this.MFAInfo.password = res.token
+                          } else {
+                            this.MFAInfo.password = res.password
+                          }
                         })
                       } else {
                         this.showMFADialog = true

src/views/assets/Asset/AssetList.vue

@@ -186,10 +186,11 @@ export default {
         }
       },
       headerActions: {
-        // canCreate: false,
-        createRoute: {
-          name: 'AssetCreate',
-          query: this.$route.query
+        createRoute: () => {
+          return {
+            name: 'AdminUserCreate',
+            query: this.$route.query || {}
+          }
         },
         searchConfig: {
           options: [