perf: 修改冲突

jumpserver · Jun 15, 2023 · 94a02a2 · 94a02a2
2 parents e60a33a + a787737
commit 94a02a2
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 13 deletions.
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
@@ -1378,6 +1378,8 @@
     "UserLoginAclCreate": "Create user login acl",
     "UserLoginAclUpdate": "Update user login acl",
     "UserLoginAclList": "User login acl",
+    "UserLoginAclDetail": "User login acl detail",
+    "ConnectMethodAclDetail": "Connect method acl detail",
     "ConnectMethodAclCreate": "Create connect method acl",
     "ConnectMethodAclList": "Connect method acl",
     "ConnectMethodAclUpdate": "Update connect method acl"

diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
@@ -1375,6 +1375,8 @@
     "UserLoginAclList": "ユーザーログイン",
     "ConnectMethodAclCreate": "接続方式制御の作成",
     "ConnectMethodAclList": "接続方式",
+    "ConnectMethodAclDetail": "接続方式制御の詳細",
+    "UserLoginAclDetail": "ユーザーログイン制御の詳細",
     "ConnectMethodAclUpdate": "接続方式制御ルールの更新"
   },
   "rbac": {

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
@@ -1159,8 +1159,10 @@
     "Acls": "访问控制",
     "UserLoginAclCreate": "创建用户登录控制",
     "UserLoginAclList": "用户登录",
+    "UserLoginAclDetail": "用户登录控制详情",
     "UserLoginAclUpdate": "更新用户登录控制",
     "ConnectMethodAclList": "连接方式",
+    "ConnectMethodAclDetail": "连接方式控制详情",
     "ConnectMethodAclCreate": "创建连接方式控制",
     "ConnectMethodAclUpdate": "更新连接方式控制",
     "AppletDetail": "远程应用",

diff --git a/src/router/console/acls.js b/src/router/console/acls.js
@@ -38,7 +38,7 @@ export default [
         component: () => import('@/views/acl/UserLoginACL/UserDetail/index'),
         hidden: true,
         meta: {
-          title: i18n.t('route.AssetAclDetail'),
+          title: i18n.t('route.UserLoginAclDetail'),
           app: 'acls',
           resource: 'loginacl'
         }
@@ -219,7 +219,7 @@ export default [
         name: 'ConnectMethodAclDetail',
         component: () => import('@/views/acl/ConnectMethodAcl/ConnectMethodAclDetail/index'),
         hidden: true,
-        meta: { title: i18n.t('route.AssetAclDetail') }
+        meta: { title: i18n.t('route.ConnectMethodAclDetail') }
       },
       {
         path: ':id/update',

diff --git a/src/styles/index.scss b/src/styles/index.scss
@@ -281,3 +281,10 @@ input[type=file] {
     padding-top: 3px!important;
   }
 }
+
+.sync-setting-org.el-select-dropdown .el-select-dropdown__item {
+  max-width: 600px !important;
+  overflow: hidden !important;
+  white-space: nowrap !important;
+  text-overflow: ellipsis !important;
+}
diff --git a/src/utils/org.js b/src/utils/org.js
@@ -35,7 +35,10 @@ async function changeOrg(org, reload = true, vm = null) {
   }
   // 替换 Path 中的 UUID
   const idRegex = /\/?([a-fA-F0-9]{8}-(?:[a-fA-F0-9]{4}-){3}[a-fA-F0-9]{12})|(-?\d+(\.\d+)?)\/?/
-  path = path.replace(idRegex, '')
+  const i = path.search(idRegex)
+  if (i !== -1) {
+    path = path.slice(0, i + 1)
+  }
 
   // 替换 Query 中的 UUID
   const newQuery = {}

diff --git a/src/views/assets/Asset/AssetList/components/BaseList.vue b/src/views/assets/Asset/AssetList/components/BaseList.vue
@@ -192,8 +192,8 @@ export default {
                   can: ({ row }) =>
                     this.$hasPerm('assets.test_assetconnectivity') &&
                     !this.$store.getters.currentOrgIsRoot &&
-                    row['auto_config'].ansible_enabled &&
-                    row['auto_config'].ping_enabled,
+                    row?.auto_config?.ansible_enabled &&
+                    row?.auto_config?.ping_enabled,
                   callback: ({ row }) => {
                     if (row.platform.name === 'Gateway') {
                       this.GatewayVisible = true

diff --git a/src/views/profile/ProfileUpdate/PasswordUpdate.vue b/src/views/profile/ProfileUpdate/PasswordUpdate.vue
@@ -45,7 +45,10 @@ export default {
         new_password: {
           label: this.$t('users.NewPassword'),
           rules: [rules.RequiredChange],
-          component: UserPassword
+          component: UserPassword,
+          el: {
+            userIsOrgAdmin: false
+          }
         },
         new_password_again: {
           label: this.$t('users.ConfirmPassword'),
@@ -57,6 +60,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.fieldsMeta.new_password.el.userIsOrgAdmin = this.object['is_org_admin']
+  },
   methods: {
     submitMethod() {
       return 'put'

diff --git a/src/views/settings/Ldap/SyncSettingDialog.vue b/src/views/settings/Ldap/SyncSettingDialog.vue
@@ -40,6 +40,7 @@ export default {
             component: Select2,
             rules: [Required],
             el: {
+              popperClass: 'sync-setting-org',
               multiple: true,
               ajax: {
                 url: '/api/v1/orgs/orgs/',
@@ -77,10 +78,5 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .el-select-dropdown .el-select-dropdown__item {
-  max-width: 600px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
+
 </style>
diff --git a/src/views/users/User/UserCreateUpdate.vue b/src/views/users/User/UserCreateUpdate.vue
@@ -193,7 +193,7 @@ export default {
   methods: {
     afterGetUser(user) {
       this.user = user
-      this.fieldsMeta.password.el.userIsOrgAdmin = user.role === 'Admin' || user.org_roles.indexOf('Admin') !== -1
+      this.fieldsMeta.password.el.userIsOrgAdmin = user['is_org_admin']
       if (this.$route.query.clone_from) {
         this.user.groups = []
       }