From fb85e168e767724712bf042ac0d852b86b10c04f Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 7 Jun 2023 17:41:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?perf:=20=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=20ACL=20=E6=8C=AA=E5=88=B0=E6=8E=A7=E5=88=B6=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoDataForm/components/NestedField.vue   |  4 +
 src/i18n/langs/en.json                        |  1 +
 src/i18n/langs/zh.json                        |  8 +-
 src/router/console/perms.js                   | 94 ++++++++++++++++++-
 src/router/console/sessions.js                |  1 -
 src/router/console/users.js                   | 41 --------
 src/utils/startup.js                          |  5 +-
 .../AssetLoginAclCreateUpdate.vue}            |  8 +-
 .../AssetLoginAclDetail}/Detail.vue           |  0
 .../AssetLoginAclDetail}/index.vue            |  0
 .../AssetLoginAclList.vue}                    |  0
 .../ConnectMethodAclCreateUpdate.vue          | 71 ++++++++++++++
 .../ConnectMethodAcl/ConnectMethodAclList.vue | 35 +++++++
 .../acl/UserLoginACL/UserDetail/index.vue     |  7 +-
 .../UserLoginACL/UserLoginACLCreateUpdate.vue | 65 ++-----------
 .../acl/UserLoginACL/UserLoginACLList.vue     | 53 ++---------
 .../acl/UserLoginACL/UserLoginACLTable.vue    | 69 ++++++++++++++
 .../users/User/UserDetail/UserLoginAcl.vue    | 30 ++++++
 src/views/users/User/UserDetail/index.vue     |  6 +-
 19 files changed, 337 insertions(+), 161 deletions(-)
 rename src/views/acl/{AssetAcl/AssetAclCreateUpdate.vue => AssetLoginAcl/AssetLoginAclCreateUpdate.vue} (96%)
 rename src/views/acl/{AssetAcl/AssetAclDetail => AssetLoginAcl/AssetLoginAclDetail}/Detail.vue (100%)
 rename src/views/acl/{AssetAcl/AssetAclDetail => AssetLoginAcl/AssetLoginAclDetail}/index.vue (100%)
 rename src/views/acl/{AssetAcl/AssetAclList.vue => AssetLoginAcl/AssetLoginAclList.vue} (100%)
 create mode 100644 src/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue
 create mode 100644 src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
 create mode 100644 src/views/acl/UserLoginACL/UserLoginACLTable.vue
 create mode 100644 src/views/users/User/UserDetail/UserLoginAcl.vue

diff --git a/src/components/AutoDataForm/components/NestedField.vue b/src/components/AutoDataForm/components/NestedField.vue
index d57dc56bb..934797aa6 100644
--- a/src/components/AutoDataForm/components/NestedField.vue
+++ b/src/components/AutoDataForm/components/NestedField.vue
@@ -65,6 +65,10 @@ export default {
       return fields
     }
   },
+  mounted() {
+    console.log('Value is: ', this.value)
+    console.log('Fields: ', this.iFields)
+  },
   methods: {
     objectToString(obj) {
       let data = ''
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index bf84b9c3a..f80ff3039 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -1151,6 +1151,7 @@
   },
   "route": {
     "": "",
+
     "AppletDetail": "Remote apps",
     "CreateEndpoint": "Create endpoint",
     "UpdateEndpoint": "Update endpoint",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 249f716d7..6a3a50d5b 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1150,6 +1150,11 @@
   },
   "route": {
     "": "",
+    "UserLoginAclList": "登录控制",
+    "UserLoginAclUpdate": "更新登录控制",
+    "ConnectMethodAclList": "连接方式",
+    "ConnectMethodAclCreate": "创建连接方式控制",
+    "ConnectMethodAclUpdate": "更新连接方式控制",
     "AppletDetail": "远程应用",
     "AppletHostDetail": "远程应用发布机详情",
     "AppletHostCreate": "添加远程应用发布机",
@@ -1369,7 +1374,8 @@
     "uploadZipTips": "请上传 zip 格式的文件",
     "HostDeployment": "发布机部署",
     "TerminalStat": "CPU/内存/磁盘",
-    "Endpoint": "端点"
+    "Endpoint": "端点",
+    "ConnectMethod": "连接方式"
   },
   "sessions": {
     "SetToDefaultStorage": "设置为默认存储",
diff --git a/src/router/console/perms.js b/src/router/console/perms.js
index 8c20d0616..feace1a51 100644
--- a/src/router/console/perms.js
+++ b/src/router/console/perms.js
@@ -39,6 +39,7 @@ export default [
       }
     ]
   },
+
   {
     path: 'login-asset-acls',
     component: empty,
@@ -53,27 +54,27 @@ export default [
       {
         path: '',
         name: 'AssetAclList',
-        component: () => import('@/views/acl/AssetAcl/AssetAclList'),
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclList.vue'),
         meta: { title: i18n.t('route.AssetAclList') }
       },
       {
         path: 'create',
         name: 'AssetAclCreate',
-        component: () => import('@/views/acl/AssetAcl/AssetAclCreateUpdate'),
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
         hidden: true,
         meta: { title: i18n.t('route.AssetAclCreate') }
       },
       {
         path: ':id',
         name: 'AssetAclDetail',
-        component: () => import('@/views/acl/AssetAcl/AssetAclDetail/index'),
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
         hidden: true,
         meta: { title: i18n.t('route.AssetAclDetail') }
       },
       {
         path: ':id/update',
         name: 'AssetAclUpdate',
-        component: () => import('@/views/acl/AssetAcl/AssetAclCreateUpdate'),
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
         hidden: true,
         meta: { title: i18n.t('route.AssetAclUpdate') }
       }
@@ -175,5 +176,90 @@ export default [
         }
       }
     ]
+  },
+  {
+    path: 'login-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.UserLoginAclList'),
+      app: 'acls',
+      resource: 'loginacl'
+    },
+    children: [
+      {
+        path: '',
+        name: 'UserLoginAclList',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLList.vue'),
+        meta: { title: i18n.t('route.UserLoginAclList') }
+      },
+      {
+        path: 'create',
+        name: 'UserLoginAclCreate',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.UserLoginAclCreate')
+        }
+      },
+      {
+        path: ':id',
+        name: 'UserLoginAclDetail',
+        component: () => import('@/views/acl/UserLoginACL/UserDetail/index'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.AssetAclDetail'),
+          app: 'acls',
+          resource: 'loginacl'
+        }
+      },
+      {
+        path: ':id/update',
+        name: 'UserLoginAclUpdate',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.UserLoginAclUpdate') }
+      }
+    ]
+  },
+  {
+    path: 'connect-method-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.ConnectMethodList'),
+      licenseRequired: true,
+      app: 'acls',
+      resource: 'connectmethodacl'
+    },
+    children: [
+      {
+        path: '',
+        name: 'ConnectMethodAclList',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue'),
+        meta: { title: i18n.t('route.ConnectMethodAclList') }
+      },
+      {
+        path: 'create',
+        name: 'ConnectMethodAclCreate',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.ConnectMethodAclCreate') }
+      },
+      {
+        path: ':id',
+        name: 'ConnectMethodAclDetail',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
+        hidden: true,
+        meta: { title: i18n.t('route.AssetAclDetail') }
+      },
+      {
+        path: ':id/update',
+        name: 'ConnectMethodAclUpdate',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.ConnectMethodAclUpdate') }
+      }
+    ]
   }
 ]
diff --git a/src/router/console/sessions.js b/src/router/console/sessions.js
index 366adbbc4..6997519c3 100644
--- a/src/router/console/sessions.js
+++ b/src/router/console/sessions.js
@@ -2,7 +2,6 @@ import i18n from '@/i18n/i18n'
 import empty from '@/layout/empty'
 import { BASE_URL } from '@/utils/common'
 
-// Todo: 放到系统设置中
 export default [
   {
     path: 'sessions',
diff --git a/src/router/console/users.js b/src/router/console/users.js
index 5fcb3f206..ca90d6c3b 100644
--- a/src/router/console/users.js
+++ b/src/router/console/users.js
@@ -44,47 +44,6 @@ export default [
         name: 'UserDetail',
         hidden: true,
         meta: { title: i18n.t('route.UserDetail') }
-      },
-      {
-        path: 'user-acl',
-        component: empty,
-        redirect: '',
-        hidden: true,
-        meta: {
-          title: i18n.t('route.UserLoginACLList'),
-          app: 'acls',
-          resource: 'loginacl'
-        },
-        children: [
-          {
-            path: '',
-            name: 'UserLoginACLList',
-            component: () => import('@/views/acl/UserLoginACL/UserLoginACLList'),
-            hidden: true,
-            meta: { title: i18n.t('route.UserLoginACLList') }
-          },
-          {
-            path: 'create',
-            name: 'UserLoginACLCreate',
-            component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate'),
-            hidden: true,
-            meta: { title: i18n.t('route.UserLoginACLCreate') }
-          },
-          {
-            path: ':id',
-            name: 'UserLoginACLDetail',
-            component: () => import('@/views/acl/UserLoginACL/UserDetail/index'),
-            hidden: true,
-            meta: { title: i18n.t('route.UserLoginACLDetail') }
-          },
-          {
-            path: ':id/update',
-            name: 'UserLoginACLUpdate',
-            component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate'),
-            hidden: true,
-            meta: { title: i18n.t('route.UserLoginACLUpdate') }
-          }
-        ]
       }
     ]
   },
diff --git a/src/utils/startup.js b/src/utils/startup.js
index 0110e91b3..3c20d4562 100644
--- a/src/utils/startup.js
+++ b/src/utils/startup.js
@@ -107,7 +107,10 @@ export async function generatePageRoutes({ to, from, next }) {
       hidden: true
     }]
     // dynamically add accessible routes
-    Vue.$log.debug('All routes:', accessRoutes)
+    Vue.$log.debug('All routes:', accessRoutes.reduce((acc, cur) => {
+      acc[cur.name] = cur
+      return acc
+    }, {}))
     router.addRoutes(accessRoutes)
 
     await store.dispatch('permission/generateViewRoutes', { to, from })
diff --git a/src/views/acl/AssetAcl/AssetAclCreateUpdate.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue
similarity index 96%
rename from src/views/acl/AssetAcl/AssetAclCreateUpdate.vue
rename to src/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue
index 495237b06..5a4c4736f 100644
--- a/src/views/acl/AssetAcl/AssetAclCreateUpdate.vue
+++ b/src/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue
@@ -19,11 +19,9 @@ export default {
     return {
       initial: {
         accounts: ['@ALL'],
-        rules: [
-          {
-            ip_group: ['*']
-          }
-        ]
+        rules: {
+          ip_group: ['*']
+        }
       },
       fields: [
         [this.$t('common.Basic'), ['name', 'priority']],
diff --git a/src/views/acl/AssetAcl/AssetAclDetail/Detail.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/Detail.vue
similarity index 100%
rename from src/views/acl/AssetAcl/AssetAclDetail/Detail.vue
rename to src/views/acl/AssetLoginAcl/AssetLoginAclDetail/Detail.vue
diff --git a/src/views/acl/AssetAcl/AssetAclDetail/index.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue
similarity index 100%
rename from src/views/acl/AssetAcl/AssetAclDetail/index.vue
rename to src/views/acl/AssetLoginAcl/AssetLoginAclDetail/index.vue
diff --git a/src/views/acl/AssetAcl/AssetAclList.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
similarity index 100%
rename from src/views/acl/AssetAcl/AssetAclList.vue
rename to src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
diff --git a/src/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue b/src/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue
new file mode 100644
index 000000000..9f49c4fcf
--- /dev/null
+++ b/src/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue
@@ -0,0 +1,71 @@
+<template>
+  <GenericCreateUpdatePage v-bind="$data" />
+</template>
+
+<script>
+import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
+import rules from '@/components/DataForm/rules'
+import { userJSONSelectMeta } from '@/views/users/const'
+import { assetJSONSelectMeta } from '@/views/assets/const'
+import { Select2 } from '@/components/FormFields'
+
+export default {
+  name: 'AclCreateUpdate',
+  components: {
+    GenericCreateUpdatePage
+  },
+  data() {
+    return {
+      initial: {
+      },
+      fields: [
+        [this.$t('common.Basic'), ['name', 'priority']],
+        [this.$t('users.Users'), ['users']],
+        [this.$t('terminal.ConnectMethod'), ['connect_methods']],
+        [this.$t('common.Action'), ['action', 'reviewers']],
+        [this.$t('common.Other'), ['is_active', 'comment']]
+      ],
+      fieldsMeta: {
+        priority: {
+          rules: [rules.Required]
+        },
+        assets: assetJSONSelectMeta(this),
+        users: userJSONSelectMeta(this),
+        connect_methods: {
+          component: Select2,
+          label: this.$t('terminal.ConnectMethod'),
+          el: {
+            url: '/api/v1/terminal/components/connect-methods/?flat=1&limit=10&os=all',
+            ajax: {
+              processResults: (data) => {
+                return {
+                  results: data,
+                  more: false
+                }
+              }
+            }
+          }
+        },
+        reviewers: {
+          hidden: (item) => item.action !== 'review',
+          rules: [rules.RequiredChange],
+          el: {
+            value: [],
+            ajax: {
+              url: '/api/v1/users/users/?fields_size=mini',
+              transformOption: (item) => {
+                return { label: item.name + '(' + item.username + ')', value: item.id }
+              }
+            }
+          }
+        }
+      },
+      url: '/api/v1/acls/connect-method-acls/'
+    }
+  },
+  methods: {}
+}
+</script>
+
+<style>
+</style>
diff --git a/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
new file mode 100644
index 000000000..0b220908e
--- /dev/null
+++ b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
@@ -0,0 +1,35 @@
+<template>
+  <GenericListPage :header-actions="headerActions" :table-config="tableConfig" />
+</template>
+
+<script>
+import GenericListPage from '@/layout/components/GenericListPage/index.vue'
+
+export default {
+  name: 'ConnectMethodListAcl',
+  components: { GenericListPage },
+  data() {
+    return {
+      tableConfig: {
+        url: '/api/v1/acls/connect-method-acls/',
+        columnsExclude: ['users', 'assets', 'accounts'],
+        columnsShow: {
+          min: ['name', 'actions'],
+          default: [
+            'name', 'priority', 'is_active', 'comment', 'actions'
+          ]
+        }
+      },
+      headerActions: {
+        hasRefresh: true,
+        hasExport: false,
+        hasImport: false
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/acl/UserLoginACL/UserDetail/index.vue b/src/views/acl/UserLoginACL/UserDetail/index.vue
index ff826782e..59bc548cb 100644
--- a/src/views/acl/UserLoginACL/UserDetail/index.vue
+++ b/src/views/acl/UserLoginACL/UserDetail/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericDetailPage :object.sync="TaskDetail" :active-menu.sync="config.activeMenu" v-bind="config" v-on="$listeners">
+  <GenericDetailPage :active-menu.sync="config.activeMenu" :object.sync="TaskDetail" v-bind="config" v-on="$listeners">
     <keep-alive>
       <component :is="config.activeMenu" :object="TaskDetail" />
     </keep-alive>
@@ -9,6 +9,7 @@
 <script>
 import { GenericDetailPage } from '@/layout/components'
 import Detail from './Detail.vue'
+
 export default {
   components: {
     GenericDetailPage,
@@ -27,8 +28,8 @@ export default {
         ],
         hasRightSide: false,
         actions: {
-          detailApiUrl: `/api/v1/acls/login-acls/${this.$route.params.id}/?user=${this.$route.query.user}`,
-          deleteApiUrl: `/api/v1/acls/login-acls/${this.$route.params.id}/?user=${this.$route.query.user}`
+          detailApiUrl: `/api/v1/acls/login-acls/${this.$route.params.id}/`,
+          deleteApiUrl: `/api/v1/acls/login-acls/${this.$route.params.id}/`
         }
       }
     }
diff --git a/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue b/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
index bae9d07b1..42dc84acf 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue
@@ -1,14 +1,12 @@
 <template>
-  <GenericCreateUpdatePage
-    :after-get-form-value="afterGetFormValue"
-    v-bind="$data"
-  />
+  <GenericCreateUpdatePage v-bind="$data" />
 </template>
 
 <script>
 import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
 import { WeekCronSelect } from '@/components/FormFields'
 import { Required } from '@/components/DataForm/rules'
+import { userJSONSelectMeta } from '@/views/users/const'
 
 export default {
   name: 'AclCreateUpdate',
@@ -23,17 +21,15 @@ export default {
         users: {
           username_group: ''
         },
-        rules: [
-          {
-            ip_group: ['*']
-          }
-        ]
+        rules: {
+          ip_group: ['*']
+        }
       },
       url: '/api/v1/acls/login-acls/',
       hasDetailInMsg: false,
       fields: [
         [this.$t('common.Basic'), ['name', 'priority']],
-        [this.$t('acl.users'), ['user']],
+        [this.$t('acl.users'), ['users']],
         [this.$t('acl.Rules'), ['rules']],
         [this.$t('acl.Action'), ['action', 'reviewers']],
         [this.$t('common.Other'), ['is_active', 'comment']]
@@ -42,18 +38,7 @@ export default {
         is_active: {
           type: 'checkbox'
         },
-        user: {
-          el: {
-            disabled: !!this.$route.query.user,
-            multiple: false,
-            ajax: {
-              url: '/api/v1/users/users/?fields_size=mini&all=true',
-              transformOption: (item) => {
-                return { label: item.name + '(' + item.username + ')', value: item.id }
-              }
-            }
-          }
-        },
+        users: userJSONSelectMeta(this),
         reviewers: {
           el: {
             value: [],
@@ -97,46 +82,10 @@ export default {
         }
         return url
       },
-      updateSuccessNextRoute: this.$route.query.user ? { name: 'UserDetail', params: {
-        id: this.$route.query.user
-      }} : { name: 'UserLoginACLList' },
-      createSuccessNextRoute: this.$route.query.user ? { name: 'UserDetail', params: {
-        id: this.$route.query.user
-      }} : { name: 'UserLoginACLList' },
-      onPerformError(error, method, vm) {
-        this.$emit('submitError', error)
-        const response = error.response
-        const data = response.data
-        if (response.status === 400) {
-          for (const key of Object.keys(data)) {
-            let value = data[key]
-            if (key === 'ip_group') {
-              value = Object.values(data[key])
-            }
-            if (value instanceof Array) {
-              value = value.join(';')
-            }
-            this.$refs.form.setFieldError(key, value)
-          }
-        }
-      },
-      afterGetFormValue(validValues) {
-        if (!this.$route.query.user) {
-          validValues.users.username_group = validValues.users.username_group.toString()
-        }
-        return validValues
-      },
       cleanFormValue(value) {
         if (!Array.isArray(value.rules.ip_group)) {
           value.rules.ip_group = value.rules.ip_group ? value.rules.ip_group.split(',') : []
         }
-        if (!this.$route.query.user) {
-          if (!Array.isArray(value.users.username_group)) {
-            value.users.username_group = value.users.username_group ? value.users.username_group.split(',') : []
-          }
-        } else {
-          delete value.users
-        }
         if (value.action !== 'review') {
           value.reviewers = []
         }
diff --git a/src/views/acl/UserLoginACL/UserLoginACLList.vue b/src/views/acl/UserLoginACL/UserLoginACLList.vue
index 82e904ec2..a47a25e56 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLList.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLList.vue
@@ -1,56 +1,21 @@
 <template>
-  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
+  <Page>
+    <UserLoginACLTable />
+  </Page>
+
 </template>
 
 <script>
-import GenericListTable from '@/layout/components/GenericListTable'
+import UserLoginACLTable from '@/views/acl/UserLoginACL/UserLoginACLTable.vue'
+import Page from '@/layout/components/Page'
 
 export default {
   components: {
-    GenericListTable
+    UserLoginACLTable,
+    Page
   },
   data() {
-    return {
-      tableConfig: {
-        url: `/api/v1/acls/login-acls/?user=${this.$route.params.id}`,
-        columnsExclude: ['rules'],
-        columnsShow: {
-          min: ['name', 'actions'],
-          default: ['name', 'priority', 'is_active', 'user_display', 'action', 'comment', 'actions']
-        },
-        columnsMeta: {
-          name: {
-            formatterArgs: {
-              route: 'UserLoginACLDetail',
-              routeQuery: {
-                user: this.$route.params.id
-              }
-            }
-          },
-          reviewers_amount: {
-            label: this.$t('common.ApproverNumbers')
-          },
-          actions: {
-            formatterArgs: {
-              hasClone: false,
-              updateRoute: { name: 'UserLoginACLUpdate', query: { user: this.$route.params.id }},
-              performDelete: ({ row, col }) => {
-                const id = row.id
-                const url = `/api/v1/acls/login-acls/${id}/?user=${this.$route.params.id}`
-                return this.$axios.delete(url)
-              }
-            }
-          }
-        }
-      },
-      headerActions: {
-        createRoute: { name: 'UserLoginACLCreate', query: { user: this.$route.params.id }},
-        hasRefresh: true,
-        hasExport: false,
-        hasImport: false,
-        hasMoreActions: false
-      }
-    }
+    return {}
   }
 }
 </script>
diff --git a/src/views/acl/UserLoginACL/UserLoginACLTable.vue b/src/views/acl/UserLoginACL/UserLoginACLTable.vue
new file mode 100644
index 000000000..3ebfab133
--- /dev/null
+++ b/src/views/acl/UserLoginACL/UserLoginACLTable.vue
@@ -0,0 +1,69 @@
+<template>
+  <ListTable :header-actions="headerActions" :table-config="tableConfig" />
+</template>
+
+<script>
+import ListTable from '@/components/ListTable/index.vue'
+
+export default {
+  components: {
+    ListTable
+  },
+  props: {
+    url: {
+      type: String,
+      default: '/api/v1/acls/login-acls/'
+    }
+  },
+  data() {
+    return {
+      tableConfig: {
+        url: this.url,
+        columnsExclude: ['rules'],
+        columnsShow: {
+          min: ['name', 'actions'],
+          default: [
+            'name', 'priority', 'is_active',
+            'action', 'comment', 'actions'
+          ]
+        },
+        columnsMeta: {
+          name: {
+            formatterArgs: {
+              route: 'UserLoginAclDetail'
+            }
+          },
+          reviewers_amount: {
+            label: this.$t('common.ApproverNumbers')
+          },
+          actions: {
+            formatterArgs: {
+              hasClone: false,
+              updateRoute: ({ row }) => {
+                console.log('row', row)
+                return {
+                  name: 'UserLoginAclUpdate',
+                  params: {
+                    id: row.id
+                  }
+                }
+              }
+
+            }
+          }
+        }
+      },
+      headerActions: {
+        hasRefresh: true,
+        hasExport: false,
+        hasImport: false,
+        hasMoreActions: false
+      }
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/src/views/users/User/UserDetail/UserLoginAcl.vue b/src/views/users/User/UserDetail/UserLoginAcl.vue
new file mode 100644
index 000000000..637118677
--- /dev/null
+++ b/src/views/users/User/UserDetail/UserLoginAcl.vue
@@ -0,0 +1,30 @@
+<template>
+  <UserLoginACLTable :url="url" />
+</template>
+
+<script>
+import UserLoginACLTable from '@/views/acl/UserLoginACL/UserLoginACLTable.vue'
+
+export default {
+  name: 'UserLoginAcl',
+  components: {
+    UserLoginACLTable
+  },
+  props: {
+    object: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    return {
+      url: '/api/v1/acls/login-acls/?users=' + this.object.id
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue
index 0f576137f..61efe4bbb 100644
--- a/src/views/users/User/UserDetail/index.vue
+++ b/src/views/users/User/UserDetail/index.vue
@@ -10,14 +10,14 @@
 import { GenericDetailPage } from '@/layout/components'
 import UserAssetPermissionRules from './UserAssetPermissionRules'
 import UserGrantedAssets from './UserGrantedAssets'
-import UserLoginACLList from '@/views/acl/UserLoginACL/UserLoginACLList'
 import UserInfo from './UserInfo'
+import UserLoginAcl from './UserLoginAcl.vue'
 import { mapGetters } from 'vuex'
 
 export default {
   components: {
     UserInfo,
-    UserLoginACLList,
+    UserLoginAcl,
     GenericDetailPage,
     UserGrantedAssets,
     UserAssetPermissionRules
@@ -51,7 +51,7 @@ export default {
           },
           {
             title: this.$t('route.UserAclLists'),
-            name: 'UserLoginACLList',
+            name: 'UserLoginAcl',
             hidden: () => !vm.$hasPerm('acls.view_loginacl')
           }
         ]

From e79f95a822d647c4e449f2f30e11c1ac1f831e4a Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 7 Jun 2023 17:55:53 +0800
Subject: [PATCH 2/6] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 6a3a50d5b..b792853d3 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1150,9 +1150,10 @@
   },
   "route": {
     "": "",
-    "UserLoginAclList": "登录控制",
-    "UserLoginAclUpdate": "更新登录控制",
-    "ConnectMethodAclList": "连接方式",
+    "UserLoginAclCreate": "创建用户登录控制",
+    "UserLoginAclList": "用户登录控制",
+    "UserLoginAclUpdate": "更新用户登录控制",
+    "ConnectMethodAclList": "连接方式控制",
     "ConnectMethodAclCreate": "创建连接方式控制",
     "ConnectMethodAclUpdate": "更新连接方式控制",
     "AppletDetail": "远程应用",
@@ -1203,7 +1204,7 @@
     "Device": "网络设备",
     "Database": "数据库",
     "Session": "会话",
-    "AssetPermission": "资产授权",
+    "AssetPermission": "资产授权规则",
     "AssetPermissionList": "资产授权列表",
     "AssetPermissionCreate": "创建资产授权规则",
     "AssetPermissionDetail": "资产授权详情",
@@ -1225,7 +1226,7 @@
     "CommandExecutions": "命令执行",
     "CommandFilterCreate": "创建命令过滤器",
     "CommandFilterDetail": "命令过滤器详情",
-    "CommandFilterList": "命令过滤",
+    "CommandFilterList": "命令过滤规则",
     "CommandFilterRulesCreate": "创建命令过滤器规则",
     "CommandFilterRulesUpdate": "更新命令过滤器规则",
     "CommandFilterUpdate": "更新命令过滤器",
@@ -1259,8 +1260,8 @@
     "UserAclLists": "用户登录规则",
     "UserLoginACLUpdate": "更新用户登录规则",
     "UserAclDetail": "用户登录规则详情",
-    "AssetAclList": "资产登录",
-    "CommandFilterAclList": "命令过滤",
+    "AssetAclList": "资产登录控制",
+    "CommandFilterAclList": "命令过滤规则",
     "CommandFilterAclCreate": "创建命令过滤规则",
     "CommandFilterAclDetail": "命令过滤规则详情",
     "CommandFilterAclUpdate": "更新命令过滤规则",

From 1b95af54c17886bbe79a830ce64d9e2a50d07641 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 8 Jun 2023 10:58:18 +0800
Subject: [PATCH 3/6] =?UTF-8?q?perf:=20acls=20=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/zh.json      |  11 +-
 src/icons/svg/unlock.svg    |   1 +
 src/router/console/acls.js  | 227 ++++++++++++++++++++++++++++++++++++
 src/router/console/index.js |  12 ++
 src/router/console/perms.js | 223 -----------------------------------
 5 files changed, 246 insertions(+), 228 deletions(-)
 create mode 100644 src/icons/svg/unlock.svg
 create mode 100644 src/router/console/acls.js

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index b792853d3..7361fd7b3 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -1150,10 +1150,11 @@
   },
   "route": {
     "": "",
+    "Acls": "访问控制",
     "UserLoginAclCreate": "创建用户登录控制",
-    "UserLoginAclList": "用户登录控制",
+    "UserLoginAclList": "用户登录",
     "UserLoginAclUpdate": "更新用户登录控制",
-    "ConnectMethodAclList": "连接方式控制",
+    "ConnectMethodAclList": "连接方式",
     "ConnectMethodAclCreate": "创建连接方式控制",
     "ConnectMethodAclUpdate": "更新连接方式控制",
     "AppletDetail": "远程应用",
@@ -1204,7 +1205,7 @@
     "Device": "网络设备",
     "Database": "数据库",
     "Session": "会话",
-    "AssetPermission": "资产授权规则",
+    "AssetPermission": "资产授权",
     "AssetPermissionList": "资产授权列表",
     "AssetPermissionCreate": "创建资产授权规则",
     "AssetPermissionDetail": "资产授权详情",
@@ -1260,8 +1261,8 @@
     "UserAclLists": "用户登录规则",
     "UserLoginACLUpdate": "更新用户登录规则",
     "UserAclDetail": "用户登录规则详情",
-    "AssetAclList": "资产登录控制",
-    "CommandFilterAclList": "命令过滤规则",
+    "AssetAclList": "资产登录",
+    "CommandFilterAclList": "命令过滤",
     "CommandFilterAclCreate": "创建命令过滤规则",
     "CommandFilterAclDetail": "命令过滤规则详情",
     "CommandFilterAclUpdate": "更新命令过滤规则",
diff --git a/src/icons/svg/unlock.svg b/src/icons/svg/unlock.svg
new file mode 100644
index 000000000..8824afb62
--- /dev/null
+++ b/src/icons/svg/unlock.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="32" height="32" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><rect x="6" y="22" width="36" height="22" rx="2" fill="none" stroke="#646a73" stroke-width="4" stroke-linejoin="round"/><path d="M14 22V14C14 8.47715 18.4772 4 24 4C29.5228 4 34 8.47715 34 14V22" stroke="#646a73" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/><path d="M24 30V36" stroke="#646a73" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/></svg>
diff --git a/src/router/console/acls.js b/src/router/console/acls.js
new file mode 100644
index 000000000..9e561dc14
--- /dev/null
+++ b/src/router/console/acls.js
@@ -0,0 +1,227 @@
+import i18n from '@/i18n/i18n'
+import empty from '@/layout/empty'
+
+export default [
+  {
+    path: 'login-asset-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.AssetAclList'),
+      licenseRequired: true,
+      app: 'acls',
+      resource: 'loginassetacl'
+    },
+    children: [
+      {
+        path: '',
+        name: 'AssetAclList',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclList.vue'),
+        meta: { title: i18n.t('route.AssetAclList') }
+      },
+      {
+        path: 'create',
+        name: 'AssetAclCreate',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.AssetAclCreate') }
+      },
+      {
+        path: ':id',
+        name: 'AssetAclDetail',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
+        hidden: true,
+        meta: { title: i18n.t('route.AssetAclDetail') }
+      },
+      {
+        path: ':id/update',
+        name: 'AssetAclUpdate',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.AssetAclUpdate') }
+      }
+    ]
+  },
+  {
+    path: 'cmd-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.CommandFilterAclList'),
+      app: 'acls',
+      resource: 'commandfilteracl',
+      activeMenu: '/console/perms/cmd-acls'
+    },
+    children: [
+      // Command Filter ACL
+      {
+        path: '',
+        name: 'CommandFilterAclList',
+        component: () => import('@/views/acl/CommandAcl/index'),
+        hidden: true,
+        meta: { title: i18n.t('route.CommandFilterAclList') }
+      },
+      {
+        path: 'create',
+        name: 'CommandFilterAclCreate',
+        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate'),
+        hidden: true,
+        meta: { title: i18n.t('route.CommandFilterAclCreate') }
+      },
+      {
+        path: ':id',
+        name: 'CommandFilterAclDetail',
+        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index'),
+        hidden: true,
+        meta: { title: i18n.t('route.CommandFilterAclDetail') }
+      },
+      {
+        path: ':id/update',
+        name: 'CommandFilterAclUpdate',
+        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate'),
+        hidden: true,
+        meta: { title: i18n.t('route.CommandFilterAclUpdate') }
+      }
+    ]
+  },
+  {
+    path: 'cmd-groups',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.CommandGroupList'),
+      app: 'acls',
+      resource: 'commandgroup',
+      activeMenu: '/console/perms/cmd-acls'
+    },
+    hidden: true,
+    children: [
+      // Command Group
+      {
+        path: '',
+        name: 'CommandGroupList',
+        component: () => import('@/views/acl/CommandAcl/index'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.CommandGroupList'),
+          activeMenu: '/console/perms/cmd-acls'
+        }
+      },
+      {
+        path: 'create',
+        name: 'CommandGroupCreate',
+        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupCreateUpdate'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.CommandGroupCreate'),
+          activeMenu: '/console/perms/cmd-acls'
+        }
+      },
+      {
+        path: ':id',
+        name: 'CommandGroupDetail',
+        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.CommandGroupDetail'),
+          activeMenu: '/console/perms/cmd-acls'
+        }
+      },
+      {
+        path: ':id/update',
+        name: 'CommandGroupUpdate',
+        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupCreateUpdate'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.CommandGroupUpdate'),
+          activeMenu: '/console/perms/cmd-acls'
+        }
+      }
+    ]
+  },
+  {
+    path: 'login-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.UserLoginAclList'),
+      app: 'acls',
+      resource: 'loginacl'
+    },
+    children: [
+      {
+        path: '',
+        name: 'UserLoginAclList',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLList.vue'),
+        meta: { title: i18n.t('route.UserLoginAclList') }
+      },
+      {
+        path: 'create',
+        name: 'UserLoginAclCreate',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.UserLoginAclCreate')
+        }
+      },
+      {
+        path: ':id',
+        name: 'UserLoginAclDetail',
+        component: () => import('@/views/acl/UserLoginACL/UserDetail/index'),
+        hidden: true,
+        meta: {
+          title: i18n.t('route.AssetAclDetail'),
+          app: 'acls',
+          resource: 'loginacl'
+        }
+      },
+      {
+        path: ':id/update',
+        name: 'UserLoginAclUpdate',
+        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.UserLoginAclUpdate') }
+      }
+    ]
+  },
+  {
+    path: 'connect-method-acls',
+    component: empty,
+    redirect: '',
+    meta: {
+      title: i18n.t('route.ConnectMethodList'),
+      licenseRequired: true,
+      app: 'acls',
+      resource: 'connectmethodacl'
+    },
+    children: [
+      {
+        path: '',
+        name: 'ConnectMethodAclList',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue'),
+        meta: { title: i18n.t('route.ConnectMethodAclList') }
+      },
+      {
+        path: 'create',
+        name: 'ConnectMethodAclCreate',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.ConnectMethodAclCreate') }
+      },
+      {
+        path: ':id',
+        name: 'ConnectMethodAclDetail',
+        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
+        hidden: true,
+        meta: { title: i18n.t('route.AssetAclDetail') }
+      },
+      {
+        path: ':id/update',
+        name: 'ConnectMethodAclUpdate',
+        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
+        hidden: true,
+        meta: { title: i18n.t('route.ConnectMethodAclUpdate') }
+      }
+    ]
+  }
+]
diff --git a/src/router/console/index.js b/src/router/console/index.js
index 66e1296ae..8dffd3a24 100644
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -7,6 +7,7 @@ import UsersRoute from './users'
 import AssetsRoute from './assets'
 import PermsRoute from './perms'
 import AccountRoutes from './accounts'
+import ACLRoutes from './acls'
 
 export default {
   path: '/console',
@@ -68,11 +69,22 @@ export default {
       path: '/console/perms',
       component: empty,
       name: 'Perms',
+      alwaysShow: false,
       meta: {
         title: i18n.t('route.Perms'),
         icon: 'permission'
       },
       children: PermsRoute
+    },
+    {
+      path: '/console/acls',
+      component: empty,
+      name: 'Acls',
+      meta: {
+        title: i18n.t('route.Acls'),
+        icon: 'unlock'
+      },
+      children: ACLRoutes
     }
   ]
 }
diff --git a/src/router/console/perms.js b/src/router/console/perms.js
index feace1a51..969956252 100644
--- a/src/router/console/perms.js
+++ b/src/router/console/perms.js
@@ -38,228 +38,5 @@ export default [
         meta: { title: i18n.t('route.AssetPermissionDetail') }
       }
     ]
-  },
-
-  {
-    path: 'login-asset-acls',
-    component: empty,
-    redirect: '',
-    meta: {
-      title: i18n.t('route.AssetAclList'),
-      licenseRequired: true,
-      app: 'acls',
-      resource: 'loginassetacl'
-    },
-    children: [
-      {
-        path: '',
-        name: 'AssetAclList',
-        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclList.vue'),
-        meta: { title: i18n.t('route.AssetAclList') }
-      },
-      {
-        path: 'create',
-        name: 'AssetAclCreate',
-        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
-        hidden: true,
-        meta: { title: i18n.t('route.AssetAclCreate') }
-      },
-      {
-        path: ':id',
-        name: 'AssetAclDetail',
-        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
-        hidden: true,
-        meta: { title: i18n.t('route.AssetAclDetail') }
-      },
-      {
-        path: ':id/update',
-        name: 'AssetAclUpdate',
-        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclCreateUpdate.vue'),
-        hidden: true,
-        meta: { title: i18n.t('route.AssetAclUpdate') }
-      }
-    ]
-  },
-  {
-    path: 'cmd-acls',
-    component: empty,
-    redirect: '',
-    meta: {
-      title: i18n.t('route.CommandFilterAclList'),
-      app: 'acls',
-      resource: 'commandfilteracl',
-      activeMenu: '/console/perms/cmd-acls'
-    },
-    children: [
-      // Command Filter ACL
-      {
-        path: '',
-        name: 'CommandFilterAclList',
-        component: () => import('@/views/acl/CommandAcl/index'),
-        hidden: true,
-        meta: { title: i18n.t('route.CommandFilterAclList') }
-      },
-      {
-        path: 'create',
-        name: 'CommandFilterAclCreate',
-        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate'),
-        hidden: true,
-        meta: { title: i18n.t('route.CommandFilterAclCreate') }
-      },
-      {
-        path: ':id',
-        name: 'CommandFilterAclDetail',
-        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index'),
-        hidden: true,
-        meta: { title: i18n.t('route.CommandFilterAclDetail') }
-      },
-      {
-        path: ':id/update',
-        name: 'CommandFilterAclUpdate',
-        component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclCreateUpdate'),
-        hidden: true,
-        meta: { title: i18n.t('route.CommandFilterAclUpdate') }
-      }
-    ]
-  },
-  {
-    path: 'cmd-groups',
-    component: empty,
-    redirect: '',
-    meta: {
-      title: i18n.t('route.CommandGroupList'),
-      app: 'acls',
-      resource: 'commandgroup',
-      activeMenu: '/console/perms/cmd-acls'
-    },
-    hidden: true,
-    children: [
-      // Command Group
-      {
-        path: '',
-        name: 'CommandGroupList',
-        component: () => import('@/views/acl/CommandAcl/index'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.CommandGroupList'),
-          activeMenu: '/console/perms/cmd-acls'
-        }
-      },
-      {
-        path: 'create',
-        name: 'CommandGroupCreate',
-        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupCreateUpdate'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.CommandGroupCreate'),
-          activeMenu: '/console/perms/cmd-acls'
-        }
-      },
-      {
-        path: ':id',
-        name: 'CommandGroupDetail',
-        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupDetail/index'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.CommandGroupDetail'),
-          activeMenu: '/console/perms/cmd-acls'
-        }
-      },
-      {
-        path: ':id/update',
-        name: 'CommandGroupUpdate',
-        component: () => import('@/views/acl/CommandAcl/CommandGroup/CommandGroupCreateUpdate'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.CommandGroupUpdate'),
-          activeMenu: '/console/perms/cmd-acls'
-        }
-      }
-    ]
-  },
-  {
-    path: 'login-acls',
-    component: empty,
-    redirect: '',
-    meta: {
-      title: i18n.t('route.UserLoginAclList'),
-      app: 'acls',
-      resource: 'loginacl'
-    },
-    children: [
-      {
-        path: '',
-        name: 'UserLoginAclList',
-        component: () => import('@/views/acl/UserLoginACL/UserLoginACLList.vue'),
-        meta: { title: i18n.t('route.UserLoginAclList') }
-      },
-      {
-        path: 'create',
-        name: 'UserLoginAclCreate',
-        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.UserLoginAclCreate')
-        }
-      },
-      {
-        path: ':id',
-        name: 'UserLoginAclDetail',
-        component: () => import('@/views/acl/UserLoginACL/UserDetail/index'),
-        hidden: true,
-        meta: {
-          title: i18n.t('route.AssetAclDetail'),
-          app: 'acls',
-          resource: 'loginacl'
-        }
-      },
-      {
-        path: ':id/update',
-        name: 'UserLoginAclUpdate',
-        component: () => import('@/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue'),
-        hidden: true,
-        meta: { title: i18n.t('route.UserLoginAclUpdate') }
-      }
-    ]
-  },
-  {
-    path: 'connect-method-acls',
-    component: empty,
-    redirect: '',
-    meta: {
-      title: i18n.t('route.ConnectMethodList'),
-      licenseRequired: true,
-      app: 'acls',
-      resource: 'connectmethodacl'
-    },
-    children: [
-      {
-        path: '',
-        name: 'ConnectMethodAclList',
-        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue'),
-        meta: { title: i18n.t('route.ConnectMethodAclList') }
-      },
-      {
-        path: 'create',
-        name: 'ConnectMethodAclCreate',
-        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
-        hidden: true,
-        meta: { title: i18n.t('route.ConnectMethodAclCreate') }
-      },
-      {
-        path: ':id',
-        name: 'ConnectMethodAclDetail',
-        component: () => import('@/views/acl/AssetLoginAcl/AssetLoginAclDetail/index'),
-        hidden: true,
-        meta: { title: i18n.t('route.AssetAclDetail') }
-      },
-      {
-        path: ':id/update',
-        name: 'ConnectMethodAclUpdate',
-        component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclCreateUpdate.vue'),
-        hidden: true,
-        meta: { title: i18n.t('route.ConnectMethodAclUpdate') }
-      }
-    ]
   }
 ]

From 64441e48365170d276adfb4cfbc7321d535a00e9 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 8 Jun 2023 11:28:03 +0800
Subject: [PATCH 4/6] =?UTF-8?q?perf:=20=E8=BF=98=E6=98=AF=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/console/index.js | 12 +-----------
 src/router/console/perms.js |  4 +++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/router/console/index.js b/src/router/console/index.js
index 8dffd3a24..17f60d7da 100644
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -7,7 +7,6 @@ import UsersRoute from './users'
 import AssetsRoute from './assets'
 import PermsRoute from './perms'
 import AccountRoutes from './accounts'
-import ACLRoutes from './acls'
 
 export default {
   path: '/console',
@@ -75,17 +74,8 @@ export default {
         icon: 'permission'
       },
       children: PermsRoute
-    },
-    {
-      path: '/console/acls',
-      component: empty,
-      name: 'Acls',
-      meta: {
-        title: i18n.t('route.Acls'),
-        icon: 'unlock'
-      },
-      children: ACLRoutes
     }
+
   ]
 }
 
diff --git a/src/router/console/perms.js b/src/router/console/perms.js
index 969956252..63b5daf30 100644
--- a/src/router/console/perms.js
+++ b/src/router/console/perms.js
@@ -1,5 +1,6 @@
 import i18n from '@/i18n/i18n'
 import empty from '@/layout/empty'
+import ACLRoutes from '@/router/console/acls'
 
 export default [
   {
@@ -38,5 +39,6 @@ export default [
         meta: { title: i18n.t('route.AssetPermissionDetail') }
       }
     ]
-  }
+  },
+  ...ACLRoutes
 ]

From 5274dc4e6b1980ce2a78a3e3ab9e5704c315322b Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 8 Jun 2023 13:50:01 +0800
Subject: [PATCH 5/6] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=E7=BF=BB?=
 =?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/langs/en.json                        | 34 ++++++++++++++-----
 src/i18n/langs/ja.json                        | 33 ++++++++++++++----
 .../acl/UserLoginACL/UserLoginACLTable.vue    |  3 +-
 3 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index f80ff3039..0183632e3 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -149,7 +149,9 @@
     "Rules": "Rule",
     "Action": "Action",
     "ipGroupHelpText": "* means match all. Example: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64",
-    "apply_login_account": "Apply login account"
+    "apply_login_account": "Apply login account",
+    "UserIP": "Login IP",
+    "LoginIP": "Login IP"
   },
   "applications": {
     "": "",
@@ -469,9 +471,8 @@
     "ReLoginErr": "Login time has exceeded 5 minutes, please login again"
   },
   "common": {
-    "BatchProcessing": "Select {Number} items",
-    "Generate": "Generate",
     "BatchProcessing": "Batch processing(select {Number} items)",
+    "Generate": "Generate",
     "ServerError": "Server Error",
     "CommunityEdition": "Community Edition",
     "EnterpriseEdition": "Enterprise Edition",
@@ -838,7 +839,16 @@
     "MatchIn": "In ...",
     "RelNot": "Not",
     "RelOr": "Or",
-    "Relation": "Relation"
+    "Relation": "Relation",
+    "Email": "Email",
+    "SelectAttrs": "Select attrs",
+    "MatchResult": "Match results",
+    "MatchedCount": "Match count",
+    "IsActive": "Is active",
+    "LessEqualThan": "Less than or equal to",
+    "OtherRules": "Other rules",
+    "BelongTo": "Belong to",
+    "GreatEqualThan": "Greater than or equal to"
   },
   "dashboard": {
     "ActiveAsset": "Asset active",
@@ -1151,7 +1161,6 @@
   },
   "route": {
     "": "",
-
     "AppletDetail": "Remote apps",
     "CreateEndpoint": "Create endpoint",
     "UpdateEndpoint": "Update endpoint",
@@ -1358,7 +1367,14 @@
     "Execution": "Execution history",
     "AssignedTicketList": "Todo approval",
     "JobDetail": "Job detail",
-    "Clouds": "Cloud"
+    "Clouds": "Cloud",
+    "Acls": "Acls",
+    "UserLoginAclCreate": "Create user login acl",
+    "UserLoginAclUpdate": "Update user login acl",
+    "UserLoginAclList": "User login acl",
+    "ConnectMethodAclCreate": "Create connect method acl",
+    "ConnectMethodAclList": "Connect method acl",
+    "ConnectMethodAclUpdate": "Update connect method acl"
   },
   "rbac": {
     "Permissions": "Permissions",
@@ -1375,7 +1391,9 @@
     "HostDeployment": "Remote host deployment",
     "TerminalStat": "CPU/MEM/DISK",
     "DatabasePort": "Database protocol port",
-    "BasePort": "listening port"
+    "BasePort": "listening port",
+    "Endpoint": "Endpoint",
+    "ConnectMethod": "Connect method"
   },
   "sessions": {
     "SetToDefaultStorage": "Set to default storage",
@@ -2155,4 +2173,4 @@
     "PublishStatus": "Publish status",
     "NoPublished": "Unpublished"
   }
-}
+}
\ No newline at end of file
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index d4cbbcb90..dfd636ce3 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -149,7 +149,9 @@
     "apply_login_user": "ログインユーザーの申請",
     "login_confirm_user": "登録再確認受付者",
     "RuleDetail": "ルールの詳細",
-    "apply_login_account": "ログインアカウントの申請"
+    "apply_login_account": "ログインアカウントの申請",
+    "UserIP": "ログインIP",
+    "LoginIP": "ログインIP"
   },
   "applications": {
     "": "",
@@ -469,9 +471,8 @@
     "ReLoginErr": "ログイン時間が 5 分を超えました。もう一度ログインしてください"
   },
   "common": {
-    "BatchProcessing": "選択 {Number} 項目",
-    "Generate": "生成",
     "BatchProcessing": "一括処理(選択 {Number} 項目)",
+    "Generate": "生成",
     "ServerError": "サーバーエラー",
     "RestoreDefault": "デフォルトに戻す",
     "DownloadCenter": "ダウンロードセンター",
@@ -837,7 +838,16 @@
     "MatchIn": "以下のいずれかに一致する",
     "RelNot": "でない",
     "RelOr": "または",
-    "Relation": "関係"
+    "Relation": "関係",
+    "Email": "Email",
+    "SelectAttrs": "選擇屬性",
+    "MatchResult": "マッチ結果",
+    "MatchedCount": "一致する結果",
+    "IsActive": "アクティブです",
+    "LessEqualThan": "以下または等しい",
+    "OtherRules": "他のルール",
+    "BelongTo": "所属する",
+    "GreatEqualThan": "以上または等しい"
   },
   "dashboard": {
     "TotalJobLog": "ジョブ実行総数",
@@ -1352,7 +1362,14 @@
     "AppletHostCreate": "リモート アプリケーション発行者を追加する",
     "Execution": "実行履歴",
     "JobDetail": "仕事の詳細",
-    "Clouds": "クラウド プラットフォーム"
+    "Clouds": "クラウド プラットフォーム",
+    "Acls": "ファンアクセスコントロール",
+    "UserLoginAclCreate": "ユーザーログイン制御の作成",
+    "UserLoginAclUpdate": "ユーザーログイン制御ルールの更新",
+    "UserLoginAclList": "ユーザーログイン",
+    "ConnectMethodAclCreate": "接続方式制御の作成",
+    "ConnectMethodAclList": "接続方式",
+    "ConnectMethodAclUpdate": "接続方式制御ルールの更新"
   },
   "rbac": {
     "Permissions": "権限",
@@ -1369,7 +1386,9 @@
     "HostDeployment": "パブリッシャーの導入",
     "TerminalStat": "CPU/メモリ/ディスク",
     "DatabasePort": "データベース プロトコル ポート",
-    "BasePort": "リスニング ポート"
+    "BasePort": "リスニング ポート",
+    "Endpoint": "エンドポイント",
+    "ConnectMethod": "接続方式"
   },
   "sessions": {
     "SetToDefaultStorage": "デフォルトストレージに設定",
@@ -2146,4 +2165,4 @@
     "PublishStatus": "投稿ステータス",
     "NoPublished": "未発表"
   }
-}
+}
\ No newline at end of file
diff --git a/src/views/acl/UserLoginACL/UserLoginACLTable.vue b/src/views/acl/UserLoginACL/UserLoginACLTable.vue
index 3ebfab133..ca30f6867 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLTable.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLTable.vue
@@ -57,7 +57,8 @@ export default {
         hasRefresh: true,
         hasExport: false,
         hasImport: false,
-        hasMoreActions: false
+        hasMoreActions: false,
+        createRoute: 'UserLoginAclCreate'
       }
     }
   }

From 9f893af74bd95169aaead50b0c3ce359a46c33a9 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Thu, 8 Jun 2023 14:37:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?perf:=20ACL=20=E4=B8=AD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=20help=20text?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/AutoDataForm/components/NestedField.vue     | 4 ----
 src/i18n/langs/zh.json                                     | 5 +++++
 src/views/acl/AssetLoginAcl/AssetLoginAclList.vue          | 3 ++-
 .../CommandAcl/CommandFilterAcl/CommandFilterAclList.vue   | 7 ++++++-
 src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue    | 3 ++-
 src/views/acl/UserLoginACL/UserLoginACLList.vue            | 6 ++++--
 src/views/perms/AssetPermission/AssetPermissionList.vue    | 3 ++-
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/components/AutoDataForm/components/NestedField.vue b/src/components/AutoDataForm/components/NestedField.vue
index 934797aa6..d57dc56bb 100644
--- a/src/components/AutoDataForm/components/NestedField.vue
+++ b/src/components/AutoDataForm/components/NestedField.vue
@@ -65,10 +65,6 @@ export default {
       return fields
     }
   },
-  mounted() {
-    console.log('Value is: ', this.value)
-    console.log('Fields: ', this.iFields)
-  },
   methods: {
     objectToString(obj) {
       let data = ''
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 7361fd7b3..831565a4a 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -115,6 +115,10 @@
     }
   },
   "acl": {
+    "CommandFilterACLHelpMsg": "通过命令过滤，您可以控制命令是否可以发送到资产上。根据您设定的规则，某些命令可以被放行，而另一些命令则被禁止。",
+    "AssetLoginACLHelpMsg": "登录资产时，可以根据用户的登录 IP 和时间段进行审核，判断是否可以登录资产",
+    "UserLoginACLHelpMsg": "登录系统时，可以根据用户的登录 IP 和时间段进行审核，判断是否可以登录系统",
+    "ConnectMethodACLHelpMsg": "通过连接方式过滤，您可以控制用户是否可以使用某种连接方式登录到资产上。根据您设定的规则，某些连接方式可以被放行，而另一些连接方式则被禁止。",
     "LoginIP": "登录 IP",
     "UserIP": "登录 IP",
     "apply_login_account": "申请登录账号",
@@ -1079,6 +1083,7 @@
   },
   "perms": {
     "": "",
+    "AssetPermissionHelpMsg": "资产授权允许您选择用户和资产，将资产授权给用户以便访问。一旦授权完成，用户便可便捷地浏览这些资产。此外，您还可以设置特定的权限位，以进一步定义用户对资产的权限范围。",
     "AccountsHelp": "<b>所有账号</b>: 资产上已添加的所有账号; <br/> <b>指定账号</b>：指定资产下账号的用户名；<br/>手动账号: 用户名/密码 登录时手动输入; <br/>同名账号: 与被授权人用户名相同的账号;",
     "AllAccounts": "所有账号",
     "AllAccountTip": "资产上已添加的所有账号",
diff --git a/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue b/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
index 3365fda99..c14c997e5 100644
--- a/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
+++ b/src/views/acl/AssetLoginAcl/AssetLoginAclList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" />
+  <GenericListPage :header-actions="headerActions" :help-message="helpMsg" :table-config="tableConfig" />
 </template>
 
 <script>
@@ -11,6 +11,7 @@ export default {
   },
   data() {
     return {
+      helpMsg: this.$t('acl.AssetLoginACLHelpMsg'),
       tableConfig: {
         url: '/api/v1/acls/login-asset-acls/',
         columnsExclude: ['users', 'assets', 'accounts'],
diff --git a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue
index 1f9a54dcd..3c692436c 100644
--- a/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue
+++ b/src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue
@@ -1,5 +1,9 @@
 <template>
-  <ListTable :header-actions="headerActions" :table-config="tableConfig" />
+  <div>
+    <el-alert type="success">{{ helpMsg }}</el-alert>
+    <ListTable :header-actions="headerActions" :table-config="tableConfig" />
+  </div>
+
 </template>
 
 <script>
@@ -12,6 +16,7 @@ export default {
   },
   data() {
     return {
+      helpMsg: this.$t('acl.CommandFilterACLHelpMsg'),
       tableConfig: {
         url: '/api/v1/acls/command-filter-acls/',
         permissions: {
diff --git a/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
index 0b220908e..6b0b1e1b1 100644
--- a/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
+++ b/src/views/acl/ConnectMethodAcl/ConnectMethodAclList.vue
@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :header-actions="headerActions" :table-config="tableConfig" />
+  <GenericListPage :header-actions="headerActions" :help-message="helpText" :table-config="tableConfig" />
 </template>
 
 <script>
@@ -10,6 +10,7 @@ export default {
   components: { GenericListPage },
   data() {
     return {
+      helpText: this.$t('acl.ConnectMethodACLHelpMsg'),
       tableConfig: {
         url: '/api/v1/acls/connect-method-acls/',
         columnsExclude: ['users', 'assets', 'accounts'],
diff --git a/src/views/acl/UserLoginACL/UserLoginACLList.vue b/src/views/acl/UserLoginACL/UserLoginACLList.vue
index a47a25e56..567d19fb7 100644
--- a/src/views/acl/UserLoginACL/UserLoginACLList.vue
+++ b/src/views/acl/UserLoginACL/UserLoginACLList.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page>
+  <Page :help-message="helpMsg">
     <UserLoginACLTable />
   </Page>
 
@@ -15,7 +15,9 @@ export default {
     Page
   },
   data() {
-    return {}
+    return {
+      helpMsg: this.$t('acl.UserLoginACLHelpMsg')
+    }
   }
 }
 </script>
diff --git a/src/views/perms/AssetPermission/AssetPermissionList.vue b/src/views/perms/AssetPermission/AssetPermissionList.vue
index 4b11b60b5..c19495d44 100644
--- a/src/views/perms/AssetPermission/AssetPermissionList.vue
+++ b/src/views/perms/AssetPermission/AssetPermissionList.vue
@@ -1,5 +1,5 @@
 <template>
-  <Page v-bind="$attrs">
+  <Page :help-message="helpMsg" v-bind="$attrs">
     <AssetTreeTable
       ref="AssetTreeTable"
       :header-actions="headerActions"
@@ -30,6 +30,7 @@ export default {
   },
   data() {
     return {
+      helpMsg: this.$t('perms.AssetPermissionHelpMsg'),
       treeSetting: {
         showMenu: false,
         showAssets: true,