Merge pull request #2906 from jumpserver/pr@dev@ticket_push_account

perf: 工单推荐账号过滤组织

src/components/AccountCreateUpdateForm/index.vue

@@ -156,6 +156,7 @@ export default {
           options: []
         },
         push_now: {
+          helpText: this.$t('accounts.AccountPush.WindowsPushHelpText'),
           hidden: () => {
             const automation = this.iPlatform.automation || {}
             return !automation.push_account_enabled || !automation.ansible_enabled || !this.$hasPerm('accounts.push_account')

src/i18n/langs/en.json

@@ -78,6 +78,7 @@
       "AddSystemUser": "Add system user"
     },
     "AccountPush": {
+      "WindowsPushHelpText": "Windows assets do not support pushing keys",
       "AccountPushExecutionList": "Execution list",
       "AccountPushCreate": "Account push create",
       "AccountPushUpdate": "Account push update",

src/i18n/langs/ja.json

@@ -78,6 +78,7 @@
       "AddSystemUser": "システムユーザーを追加"
     },
     "AccountPush": {
+      "WindowsPushHelpText": "windows アセットはプッシュキーをサポートしていません",
       "AccountPushExecutionList": "実行リスト",
       "AccountPushCreate": "アカウントのプッシュ作成",
       "AccountPushUpdate": "アカウントプッシュ更新",

src/i18n/langs/zh.json

@@ -14,6 +14,7 @@
     "PleaseClickLeftAssetToViewGatheredUser": "收集用户列表，点击左侧资产进行查看",
     "AutoCreate": "自动创建",
     "AccountPush": {
+      "WindowsPushHelpText": "windows 资产暂不支持推送密钥",
       "AccountPushList": "账号推送",
       "AccountPushCreate": "账号推送创建",
       "AccountPushUpdate": "账号推送更新",

src/views/perms/AssetPermission/components/AccountFormatter.vue

@@ -66,6 +66,10 @@ export default {
     nodes: {
       type: [Array],
       default: () => []
+    },
+    oid: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -144,7 +148,8 @@ export default {
               } else {
                 return item
               }
-            }).join(',')
+            }).join(','),
+            oid: this.oid
           }
         }).then(res => {
           if (!res) {

src/views/tickets/RequestAssetPerm/CreateUpdate.vue

@@ -91,7 +91,8 @@ export default {
           }
         },
         apply_accounts: {
-          component: AccountFormatter
+          component: AccountFormatter,
+          el: {}
         },
         org_id: {
           component: Select2,
@@ -105,6 +106,7 @@ export default {
             const fieldsMeta = this.fieldsMeta
             fieldsMeta.apply_assets.el.ajax.url = `/api/v1/assets/assets/suggestions/?oid=${form['org_id']}`
             fieldsMeta.apply_nodes.el.ajax.url = `/api/v1/assets/nodes/suggestions/?oid=${form['org_id']}`
+            fieldsMeta.apply_accounts.el.oid = form['org_id']
           },
           on: {
             change: ([event], updateForm) => {