perf: 基本完成框架

jumpserver · Oct 14, 2024 · e8cf834 · e8cf834
1 parent 7ff1da7
commit e8cf834
Show file tree

Hide file tree

Showing 6 changed files with 345 additions and 333 deletions.
diff --git a/src/components/Apps/AccountCreateUpdateForm/const.js b/src/components/Apps/AccountCreateUpdateForm/const.js
@@ -163,7 +163,8 @@ export const accountFieldsMeta = (vm) => {
           !automation.ansible_enabled ||
           !vm.$hasPerm('accounts.push_account') ||
           (formValue.secret_type === 'ssh_key' && vm.iPlatform.type.value === 'windows') ||
-          vm.addTemplate
+          vm.addTemplate ||
+          !formValue.secret_reset
       }
     },
     params: {

diff --git a/src/components/Apps/AccountCreateUpdateForm/index.vue b/src/components/Apps/AccountCreateUpdateForm/index.vue
@@ -65,7 +65,8 @@ export default {
         [this.$t('Basic'), ['assets', 'name', 'username', 'privileged', 'su_from', 'su_from_username']],
         [this.$t('Secret'), [
           'secret_type', 'password', 'ssh_key', 'token',
-          'access_key', 'passphrase', 'api_key'
+          'access_key', 'passphrase', 'api_key',
+          'secret_reset'
         ]],
         [this.$t('Other'), ['push_now', 'params', 'on_invalid', 'is_active', 'comment']]
       ],

diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue
@@ -177,7 +177,7 @@ export default {
             formatter: () => {
               // Todo: 通用的 formatter, 点击后 10s 后还原为 *
               return (
-                <span class='secret'>
+                <span class='secret-col'>
                   <i class='fa fa-clone'/> ******
                 </span>
               )
@@ -189,8 +189,8 @@ export default {
             formatter: () => {
               return (
                 <span class='connect'>
-                  <el-button type='primary' size='mini'>
-                    <i class='fa fa-terminal'/>
+                  <el-button type='primary' size='mini' plain>
+                    <i class='fa fa-desktop'/>
                   </el-button>
                 </span>
               )
@@ -248,7 +248,7 @@ export default {
             formatterArgs: {
               hasUpdate: false, // can set function(row, value)
               hasDelete: false, // can set function(row, value)
-              hasClone: this.hasClone,
+              hasClone: false,
               canClone: true,
               moreActionsTitle: this.$t('More'),
               extraActions: [
@@ -287,7 +287,7 @@ export default {
                 },
                 {
                   name: 'Test',
-                  title: this.$t('验证密码'),
+                  title: this.$t('验证密文'),
                   can: ({ row }) =>
                     !this.$store.getters.currentOrgIsRoot &&
                     this.$hasPerm('accounts.verify_account') &&
@@ -330,6 +330,11 @@ export default {
                   name: 'MoveToOther',
                   title: '移动到其他资产',
                   type: 'primary'
+                },
+                {
+                  name: 'Clone',
+                  title: this.$t('Duplicate'),
+                  divided: true
                 }
               ]
             }
@@ -558,4 +563,8 @@ export default {
 .cell a {
   color: var(--color-info);
 }
+
+.secret-col {
+  cursor: pointer;
+}
 </style>