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

src/views/accounts/AccountBackup/Executions/AccountBackupExecutionList.vue

@@ -107,6 +107,7 @@ export default {
       },
       headerActions: {
         searchConfig: {
+          getUrlQuery: true,
           options: [
             {
               label: this.$t('TaskID'),

src/views/accounts/AccountChangeSecret/ExecutionDetail/AccountChangeSecretRecord.vue

@@ -125,6 +125,7 @@ export default {
         hasBulkDelete: false,
         hasBulkUpdate: false,
         searchConfig: {
+          getUrlQuery: true,
           exclude: ['id', 'status', 'execution'],
           options: [
             {
@@ -187,7 +188,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/accounts/AccountChangeSecret/Executions/AccountChangeSecretExecutionList.vue

@@ -126,6 +126,7 @@ export default {
       },
       headerActions: {
         searchConfig: {
+          getUrlQuery: true,
           options: [
             {
               label: this.$t('TaskID'),

src/views/accounts/AccountDiscover/TaskExecutionList.vue

@@ -111,6 +111,7 @@ export default {
       },
       headerActions: {
         searchConfig: {
+          getUrlQuery: true,
           options: [
             {
               label: this.$t('TaskID'),

src/views/accounts/AccountPush/AccountPushExecutionList.vue

@@ -131,6 +131,7 @@ export default {
       },
       headerActions: {
         searchConfig: {
+          getUrlQuery: true,
           options: [
             {
               label: this.$t('TaskID'),

src/views/accounts/AccountPush/ExecutionDetail/AccountPushRecord.vue

@@ -80,7 +80,7 @@ export default {
       headerActions: {
         hasSearch: true,
         hasRefresh: true,
-        hasLeftActions: false,
+        hasLeftActions: true,
         hasRightActions: true,
         hasExport: false,
         hasImport: false,
@@ -88,6 +88,7 @@ export default {
         hasBulkDelete: false,
         hasBulkUpdate: false,
         searchConfig: {
+          getUrlQuery: true,
           exclude: ['id', 'status', 'execution'],
           options: [
             {

src/views/accounts/Integration/components/CallRecords.vue

@@ -22,7 +22,7 @@ export default {
       tableConfig: {
         url: this.getUrl(),
         columns: [
-          'service', 'asset', 'account', 'remote_addr', 'datetime'
+          'service', 'service_id', 'asset', 'account', 'remote_addr', 'datetime'
         ],
         extraQuery: {
           order: '-datetime'

src/views/users/Group/UserGroupList.vue

@@ -4,7 +4,6 @@
     :create-drawer="createDrawer"
     :detail-drawer="detailDrawer"
     :header-actions="headerActions"
-    :resource="$t('Group')"
     :table-config="tableConfig"
   />
 </template>