Merge pull request #3372 from jumpserver/pr@dev@perf_change_some_helptext

perf: 修改云同步说明文案

src/i18n/langs/zh.json

@@ -2008,6 +2008,7 @@
     "AssetCount": "资产数量",
     "Auditor": "审计员",
     "Cloud": {
+      "AccountHelpText": "云账号是用来连接云服务商的账号，用于获取云服务商的资源信息",
       "UniqueError": "以下属性只能设置一个",
       "ExistError": "这个元素已经存在",
       "InstanceName": "实例名称",
@@ -2038,7 +2039,7 @@
       "HostnameStrategy": "用于生成资产主机名。例如：1. 实例名称 (instanceDemo)；2. 实例名称和部分IP(后两位) (instanceDemo-250.1)",
       "IsAlwaysUpdate": "资产信息保持最新",
       "AccountCreate": "创建账户",
-      "AccountList": "账户列表",
+      "AccountList": "云账号",
       "AccountUpdate": "更新账户",
       "AccountDetail": "账户详情",
       "Cloud": "云管中心",
@@ -2056,7 +2057,7 @@
       "CloudSource": "同步源",
       "SaveSetting": "同步设置",
       "Name": "名称",
-      "Account": "账户",
+      "Account": "云账号",
       "Node": "节点",
       "WindowsAdminUser": "Windows 特权用户",
       "LinuxAdminUser": "Linux 特权用户",

src/router/console/xpack.js

@@ -149,6 +149,7 @@ export default [
             component: () => import('@/views/assets/Cloud/'),
             meta: {
               title: i18n.t('xpack.Cloud.StrategyList'),
+              activeMenu: activateMenu,
               permissions: ['xpack.view_strategy']
             }
           },
@@ -160,6 +161,7 @@ export default [
             meta: {
               title: i18n.t('common.StrategyCreate'),
               action: 'create',
+              activeMenu: activateMenu,
               permissions: ['xpack.add_strategy']
             }
           },
@@ -170,6 +172,7 @@ export default [
             hidden: true,
             meta: {
               title: i18n.t('common.StrategyUpdate'),
+              activeMenu: activateMenu,
               permissions: ['xpack.change_strategy']
             }
           },
@@ -180,6 +183,7 @@ export default [
             hidden: true,
             meta: {
               title: i18n.t('common.StrategyDetail'),
+              activeMenu: activateMenu,
               permissions: ['xpack.view_strategy']
             }
           }

src/views/assets/Cloud/Account/AccountList.vue

@@ -1,10 +1,14 @@
 <template>
-  <GenericListTable :table-config="tableConfig" :header-actions="headerActions" />
+  <GenericListTable :header-actions="headerActions" :table-config="tableConfig" />
 </template>
 
 <script type="text/jsx">
 import GenericListTable from '@/layout/components/GenericListTable'
-import { ACCOUNT_PROVIDER_ATTRS_MAP, aliyun, aws_china, aws_international, huaweicloud, qcloud, qcloud_lighthouse, azure, azure_international, ucloud, vmware, nutanix, qingcloud_private, huaweicloud_private, ctyun_private, openstack, gcp, baiducloud, jdcloud, kingsoftcloud, fc, lan } from '../const'
+import {
+  ACCOUNT_PROVIDER_ATTRS_MAP, aliyun, aws_china, aws_international, azure, azure_international, baiducloud,
+  ctyun_private, fc, gcp, huaweicloud, huaweicloud_private, jdcloud, kingsoftcloud, lan, nutanix, openstack, qcloud,
+  qcloud_lighthouse, qingcloud_private, ucloud, vmware
+} from '../const'
 
 export default {
   name: 'AccountList',
@@ -21,6 +25,11 @@ export default {
           resource: 'account'
         },
         columnsExclude: ['attrs'],
+        columnsShow: {
+          default: [
+            'name', 'provider', 'comment', 'validity', 'actions'
+          ]
+        },
         columnsMeta: {
           name: {
             sortable: true,

src/views/assets/Cloud/Strategy/StrategyCreateUpdate.vue

@@ -44,5 +44,8 @@ export default {
 
 </script>
 
-<style lang="less" scoped>
+<style lang="scss" scoped>
+>>> .attr-input {
+  margin-top: -6px;
+}
 </style>

src/views/assets/Cloud/Strategy/StrategyList.vue

@@ -58,6 +58,6 @@ export default {
 }
 </script>
 
-<style>
+<style lang='scss' scoped>
 
 </style>

src/views/assets/Cloud/Strategy/components/ActionInput.vue

@@ -1,8 +1,9 @@
 <template>
   <AttrInput
+    :before-submit="beforeSubmit"
     :form-config="formConfig"
     :table-config="tableConfig"
-    :before-submit="beforeSubmit"
+    class="attr-input"
     @submit="onSubmit"
   />
 </template>

src/views/assets/Cloud/Strategy/components/RuleInput.vue

@@ -2,6 +2,7 @@
   <AttrInput
     :form-config="formConfig"
     :table-config="tableConfig"
+    class="attr-input"
     @submit="onSubmit"
   />
 </template>

src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskCreateUpdate.vue

@@ -35,6 +35,7 @@ export default {
       url: '/api/v1/xpack/cloud/sync-instance-tasks/',
       fieldsMeta: {
         account: {
+          label: this.$t('xpack.Cloud.Account'),
           on: {
             change: ([event], updateForm) => {
               vm.fieldsMeta.regions.el.ajax.url = `/api/v1/xpack/cloud/regions/?account_id=${event?.pk}`
@@ -45,7 +46,11 @@ export default {
             multiple: false,
             value: [],
             ajax: {
-              url: '/api/v1/xpack/cloud/accounts/'
+              url: '/api/v1/xpack/cloud/accounts/',
+              transformOption: (item) => {
+                const label = `${item.name}(${item.provider.label})`
+                return { label: label, value: item.id }
+              }
             }
           }
         },