feat: Host cloud sync supports state cloud

feat: add fields tip for data masking form

src/components/Apps/GrantedAssets/index.vue

@@ -109,11 +109,6 @@ export default {
           },
           connectivity: connectivityMeta,
           comment: { ...this.comment }
-        },
-        tableAttrs: {
-          rowClassName({ row }) {
-            return !row.is_active ? 'row_disabled' : ''
-          }
         }
       },
       headerActions: {

src/components/Cards/DetailCard/index.vue

@@ -5,7 +5,7 @@
         <div v-if="item.has !== false" :key="item.key" :class="item.class " :label="item.key" class="el-form-item">
           <span slot="label" class="el-form-item__label"> {{ formateLabel(item.key) }}</span>
           <span class="item-value el-form-item__content">
-            <template
+            <component
               :is="item.component"
               v-if="item.component"
               v-bind="{...item}"

src/router/console/acls.js

@@ -176,7 +176,7 @@ export default [
         name: 'DataMaskingRules',
         meta: {
           title: i18n.t('DataMasking'),
-          licenseRequired: false,
+          licenseRequired: true,
           app: 'acls',
           resource: 'datamaskingrule'
         },
@@ -200,8 +200,8 @@ export default [
           },
           {
             path: ':id',
-            name: 'AssetACLDetail',
-            component: () => import('@/views/acls/AssetLoginACL/AssetLoginAclDetail/index'),
+            name: 'DataMaskingRuleDetail',
+            component: () => import('@/views/acls/DataMaskingRule/DataMaskingRuleDetail/index'),
             hidden: true,
             meta: { title: i18n.t('AssetACLDetail'), activeMenu: '' }
           },

src/views/accounts/AccountDiscover/DeleteDialog.vue

@@ -116,6 +116,7 @@ export default {
   },
   methods: {
     handleConfirm() {
+      this.$message.warning(this.$tc('ProcessingMessage'))
       const url = `/api/v1/accounts/gathered-accounts/${this.account.id}/`
       this.$axios.delete(url, {
         params: {

src/views/accounts/RiskDetect/RiskHandlerFormatter/index.vue

@@ -141,9 +141,9 @@ export default {
     },
     async handleCommon(cmd, payload) {
       let rows = this.rows
+      this.processing = true
       if (this.rows.length === 0) {
         rows = [this.row]
-        this.processing = true
       }
       if (!payload) {
         payload = {}

src/views/acls/DataMaskingRule/DataMaskingRuleCreateUpdate.vue

@@ -42,6 +42,9 @@ export default {
             this.fieldsMeta.accounts.el.assets = ids || []
           }
         },
+        fields_pattern: {
+          helpTip: this.$t('DataMaskingFieldsPatternHelpTip')
+        },
         mask_pattern: {
           hidden: (formValue) => {
             return !['fixed_char'].includes(formValue.masking_method)

src/views/acls/DataMaskingRule/DataMaskingRuleDetail/Detail.vue

@@ -23,17 +23,9 @@ export default {
   },
   data() {
     return {
-      url: `/api/v1/acls/login-asset-acls/${this.object.id}/`,
+      url: `/api/v1/acls/data-masking-rules/${this.object.id}/`,
       detailFields: [
-        'name',
-        {
-          key: this.$t('Action'),
-          value: this.object.action.label
-        },
-        {
-          key: this.$t('Reviewer'),
-          value: this.object.reviewers.map(item => item.name).join(', ')
-        },
+        'name', 'fields_pattern', 'masking_method', 'mask_pattern',
         'priority', 'date_created', 'created_by', 'comment'
       ]
     }
@@ -42,6 +34,6 @@ export default {
 }
 </script>
 
-<style lang='less' scoped>
+<style lang="less" scoped>
 
 </style>

src/views/acls/DataMaskingRule/DataMaskingRuleDetail/index.vue

@@ -23,7 +23,7 @@ export default {
     return {
       instance: {},
       config: {
-        url: `/api/v1/acls/login-asset-acls/`,
+        url: `/api/v1/acls/data-masking-rules/`,
         activeMenu: 'Detail',
         submenu: [
           {

src/views/acls/DataMaskingRule/DataMaskingRuleList.vue

@@ -14,7 +14,7 @@ export default {
       helpMsg: this.$t('DataMaskingRuleHelpHelpMsg'),
       tableConfig: {
         url: '/api/v1/acls/data-masking-rules/',
-        columnsExclude: ['users', 'assets', 'accounts', 'rules'],
+        columnsExclude: ['users', 'assets', 'accounts', 'rules', 'reviewers', 'action'],
         columnsShow: {
           min: ['name', 'actions'],
           default: [

src/views/assets/Cloud/Account/components/AssetPanel.vue

@@ -82,7 +82,7 @@ export default {
             [this.$tc('Platform'), 'platform'],
             [this.$tc('Node'), 'node'],
             [this.$tc('Protocol'), 'protocols'],
-            [this.$tc('Region'), 'region_id']
+            [this.$tc('Region'), 'region_name']
           ],
           data: []
         },
@@ -126,7 +126,7 @@ export default {
       this.ws.onmessage = (e) => {
         const data = JSON.parse(e.data)
         if (data.action === 'sync_region') {
-          this.addRegion(data.region_id)
+          this.addRegion(data.id, data.name)
         } else if (data.action === 'import') {
           data['@status'] = 'pending'
           this.$refs.importTable.addTableItem(data)
@@ -142,10 +142,10 @@ export default {
         }
       }
     },
-    addRegion(region) {
-      if (!this.alreadySync.includes(region)) {
-        this.alreadySync.push(region)
-        this.tip = `${this.$t('SyncRegion')}: ${this.alreadySync.at(-1)}`
+    addRegion(regionId, regionName) {
+      if (!this.alreadySync.includes(regionId)) {
+        this.alreadySync.push(regionId)
+        this.tip = `${this.$t('SyncRegion')}: ${regionName}`
       }
     },
     showResult() {

src/views/assets/Cloud/const.js

@@ -17,6 +17,8 @@ export const ucloud = 'ucloud'
 
 export const volcengine = 'volcengine'
 
+export const ctyun = 'ctyun'
+
 export const qingcloud_private = 'qingcloud_private'
 export const huaweicloud_private = 'huaweicloud_private'
 export const ctyun_private = 'ctyun_private'
@@ -46,7 +48,8 @@ export const publicHostProviders = [
   gcp,
   ucloud,
   volcengine,
-  smartx
+  smartx,
+  ctyun
 ]
 
 export const publicDBProviders = [aliyun]
@@ -141,6 +144,12 @@ export const ACCOUNT_PROVIDER_ATTRS_MAP = {
     attrs: ['access_key_id', 'access_key_secret'],
     image: require('@/assets/img/cloud/volcengine.svg')
   },
+  [ctyun]: {
+    name: ctyun,
+    title: i18n.t('CTYun'),
+    attrs: ['access_key_id', 'access_key_secret'],
+    image: require('@/assets/img/cloud/state.svg')
+  },
   [vmware]: {
     name: vmware,
     title: 'VMware',

src/views/ops/Adhoc/QuickJob.vue

@@ -557,7 +557,7 @@ $container-bg-color: #f7f7f7;
 
       & ::v-deep .xterm {
         height: calc(100% - 8px);
-        overflow-y: auto;
+        overflow-y: hidden;
       }
     }
   }

src/views/reports/base/RightAction.vue

@@ -65,7 +65,13 @@ export default {
       }
       const days = this.getDaysParam()
       this.$message.success(this.$t('EMailReport') + '...')
-      this.$axios.post(`/core/reports/send-mail/?chart=${this.name}&days=${days}`,).catch(error => {
+      this.$axios.post(`/core/reports/send-mail/?chart=${this.name}&days=${days}`,).then((res) => {
+        if (res.error) {
+          this.$message.error(res.error)
+        } else {
+          this.$message.success(res.message)
+        }
+      }).catch(error => {
         this.$message.error(this.$t('Failed') + ': ' + error.message)
       })
     },

src/views/settings/Applet/AppletHost/AppletHostList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-alert type="success">
-      <span v-sanitize="$t('AppletHostSelectHelpMessage')" />
+      <span v-html="$t('AppletHostSelectHelpMessage')" />
     </el-alert>
     <DrawerListTable
       ref="table"

src/views/settings/Msg/Subscribe/index.vue

@@ -93,7 +93,9 @@ export default {
       this.$axios.patch(
         `/api/v1/notifications/system-msg-subscription/${sub.id}/`,
         { receive_backends: backends }
-      ).catch(err => {
+      ).then(() => {
+        this.$message.success(this.$t('UpdateSuccessMsg'))
+      }).catch(err => {
         this.$log.error(err)
       })
     },

src/views/workbench/myassets/index.vue

@@ -41,7 +41,6 @@ export default {
               name: 'connect',
               icon: 'fa-desktop',
               type: 'primary',
-              plain: true,
               can: ({ row }) => row.is_active,
               callback: ({ row }) => {
                 const oid = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : ''