Merge branch 'pam' of github.com:jumpserver/lina into pam

src/components/Drawer/index.vue

@@ -133,6 +133,7 @@ export default {
 
       &.detail-card {
         padding-right: 0;
+        margin-top: unset;
       }
 
       // Detail 中

src/components/Table/ListTable/TableAction/ImportTable.vue

@@ -105,6 +105,7 @@ export default {
       importStatusFilter: 'all',
       iTotalData: [],
       defaultTableConfig: {
+        url: '',
         hasSelection: false,
         // hasPagination: false,
         columns: [],

src/views/accounts/AccountChangeSecret/AccountChangeSecretCreateUpdate.vue

@@ -84,6 +84,18 @@ export default {
             assets: this.asset_ids,
             nodes: this.node_ids
           }
+        },
+        recipients: {
+          helpText: this.$t('OnlyMailSend'),
+          el: {
+            value: [],
+            ajax: {
+              url: '/api/v1/users/users/?fields_size=mini',
+              transformOption: (item) => {
+                return { label: item.name + '(' + item.username + ')', value: item.id }
+              }
+            }
+          }
         }
       },
       createSuccessNextRoute: { name: 'AccountChangeSecretList' },

src/views/assets/Asset/AssetList/components/BaseList.vue

@@ -217,6 +217,8 @@ export default {
   },
   methods: {
     async updateOrCloneAsset(row, action) {
+      this.$route.params.id = row.id
+      this.$route.params.action = action
       const meta = {
         action: action,
         id: row.id,