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

src/components/Apps/AccountListTable/const.js

@@ -148,6 +148,9 @@ export const accountOtherActions = (vm) => [
     title: vm.$t('CopyToAsset'),
     type: 'primary',
     divided: true,
+    has: () => {
+      return !vm.asset
+    },
     callback: ({ row }) => {
       vm.accountCreateUpdateTitle = vm.$t('CopyToOther')
       vm.$route.query.flag = 'copy'
@@ -160,6 +163,9 @@ export const accountOtherActions = (vm) => [
     name: 'MoveToOther',
     title: vm.$t('MoveToAsset'),
     type: 'primary',
+    has: () => {
+      return !vm.asset
+    },
     callback: ({ row }) => {
       vm.accountCreateUpdateTitle = vm.$t('MoveToOther')
       vm.$route.query.flag = 'move'

src/views/accounts/AccountDiscover/DeleteDialog.vue

@@ -11,7 +11,7 @@
       v-on="$listeners"
     >
       <el-alert type="error">
-        "{{ this.$t('DeleteWarningMsg') }}" "{{ account.username }} - {{ account.asset.name }}" ?
+        {{ this.$t('DeleteWarningMsg') }} {{ account.username }}({{ account.asset.name }}) ?
 
         <div class="extra-delete">
           <div v-if="hasDeleteAccount && assetAccounts.length > 0" class="delete-item">

src/views/accounts/AccountDiscover/TaskCreateUpdate.vue

@@ -16,7 +16,7 @@ export default {
     return {
       fields: [
         [this.$t('Basic'), ['name', 'nodes', 'assets']],
-        [this.$t('DiscoverConfig'), ['is_sync_account', 'check_risk', 'recipients']],
+        [this.$t('Config'), ['is_sync_account', 'check_risk', 'recipients']],
         [this.$t('Periodic'), ['is_periodic', 'crontab', 'interval']],
         [this.$t('Other'), ['is_active', 'comment']]
       ],

src/views/accounts/AccountDiscover/TaskDetail/Detail.vue

@@ -33,7 +33,7 @@ export default {
         },
         {
           key: this.$t('DateLastSync'),
-          value: this.object.date_last_sync ? toSafeLocalDateStr(this.object.date_created) : '-'
+          value: this.object.last_execution_date ? toSafeLocalDateStr(this.object.last_execution_date) : '-'
         },
         {
           key: this.$t('DateCreated'),

src/views/accounts/const.js

@@ -114,7 +114,7 @@ export const gatherAccountHeaderActions = (vm) => {
     hasImport: false,
     hasExport: true,
     searchConfig: {
-      exclude: ['asset'],
+      exclude: ['asset', 'id'],
       options: [
         {
           label: vm.$t('AssetName'),