perf: Update Dockerfile with new base image tag

feat: add oracle port

Dockerfile

@@ -1,4 +1,4 @@
-FROM jumpserver/lina-base:20240723_084702 AS stage-build
+FROM jumpserver/lina-base:20250408_112930 AS stage-build
 
 ARG VERSION
 ENV VERSION=$VERSION

package.json

@@ -2,7 +2,7 @@
   "name": "lina",
   "version": "v4.0.0",
   "description": "JumpServer Web UI",
-  "author": "JumpServer Team <support@fit2cloud.com>",
+  "author": "JumpServer Team <support@lxware.hk>",
   "license": "GPL-3.0-or-later",
   "scripts": {
     "dev": "NODE_OPTIONS=--openssl-legacy-provider vue-cli-service serve",
@@ -81,6 +81,7 @@
     "vue-select": "^3.9.5",
     "vuejs-logger": "^1.5.4",
     "vuex": "3.1.0",
+    "watermark-js-plus": "^1.5.8",
     "xss": "^1.0.14",
     "xterm": "^4.5.0",
     "xterm-addon-fit": "^0.3.0",
@@ -94,7 +95,6 @@
     "@vue/cli-plugin-unit-jest": "3.6.3",
     "@vue/cli-service": "3.6.0",
     "@vue/test-utils": "1.0.0-beta.29",
-    "@vue/runtime-dom": "3.5.13",
     "autoprefixer": "^9.5.1",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
@@ -121,7 +121,7 @@
     "serve-static": "^1.16.0",
     "strip-ansi": "^7.1.0",
     "svg-sprite-loader": "4.1.3",
-    "svgo": "1.2.4",
+    "svgo": "1.2.2",
     "vue-i18n-extract": "^1.1.1",
     "vue-template-compiler": "2.6.10"
   },
@@ -143,5 +143,6 @@
     "src/**/*.{js,vue}": [
       "eslint --fix"
     ]
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

src/App.vue

@@ -5,14 +5,59 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
+import { Watermark } from 'watermark-js-plus'
 
 export default {
   name: 'App',
+  data() {
+    return {
+      watermark: null
+    }
+  },
   computed: {
     ...mapState({
       isRouterAlive: state => state.common.isRouterAlive
+    }),
+    ...mapGetters({
+      currentUser: 'currentUser',
+      publicSettings: 'publicSettings'
     })
+  },
+  watch: {
+    currentUser: {
+      handler(newVal) {
+        this.createWatermark()
+      }
+    },
+    'publicSettings.SECURITY_WATERMARK_ENABLED': {
+      handler(newVal) {
+        if (!newVal) {
+          return setTimeout(() => {
+            this.watermark?.destroy()
+            this.watermark = null
+          })
+        }
+
+        this.createWatermark()
+      }
+    }
+  },
+  methods: {
+    createWatermark() {
+      if (this.currentUser?.username && this.publicSettings?.SECURITY_WATERMARK_ENABLED) {
+        this.watermark = new Watermark({
+          content: `${this.currentUser.username}(${this.currentUser.name})`,
+          width: 200,
+          height: 200,
+          rotate: 45,
+          fontWeight: 'normal',
+          fontColor: 'rgba(128, 128, 128, 0.2)'
+        })
+
+        this.watermark.create()
+      }
+    }
   }
 }
 </script>

src/components/Apps/AccountCreateUpdateForm/const.js

@@ -6,6 +6,13 @@ import AutomationParamsForm from '@/views/assets/Platform/AutomationParamsSettin
 export const accountFieldsMeta = (vm) => {
   const defaultPrivilegedAccounts = ['root', 'administrator']
 
+  function onPrivilegedUser(value, updateForm) {
+    const maybePrivileged = defaultPrivilegedAccounts.includes(value)
+    if (maybePrivileged) {
+      updateForm({ privileged: true, secret_reset: false, push_now: false })
+    }
+  }
+
   return {
     assets: {
       component: Select2,
@@ -70,11 +77,8 @@ export const accountFieldsMeta = (vm) => {
             if (!vm.account?.name) {
               updateForm({ username: value })
             }
-            const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-            if (maybePrivileged) {
-              updateForm({ privileged: true })
-            }
           }
+          onPrivilegedUser(value, updateForm)
         }
       },
       hidden: () => {
@@ -92,10 +96,7 @@ export const accountFieldsMeta = (vm) => {
           vm.usernameChanged = true
         },
         change: ([value], updateForm) => {
-          const maybePrivileged = defaultPrivilegedAccounts.includes(value)
-          if (maybePrivileged) {
-            updateForm({ privileged: true })
-          }
+          onPrivilegedUser(value, updateForm)
         }
       },
       hidden: () => {

src/components/Apps/AccountListTable/AccountList.vue

@@ -182,13 +182,21 @@ export default {
         },
         columnsMeta: {
           name: {
-            width: '120px',
+            minWidth: '60px',
             formatterArgs: {
               can: () => vm.$hasPerm('accounts.view_account'),
               getRoute: ({ row }) => ({
                 name: 'AccountDetail',
                 params: { id: row.id }
               }),
+              getTitle: ({ row }) => {
+                let title = row.name
+                if (row.ds && this.asset && this.asset.id !== row.asset.id) {
+                  const dsID = row.ds.id.split('-')[0]
+                  title = `${row.name}@${dsID}`
+                }
+                return title
+              },
               getDrawerTitle({ row }) {
                 return `${row.username}@${row.asset.name}`
               }
@@ -208,15 +216,18 @@ export default {
             width: '80px',
             formatter: AccountConnectFormatter,
             formatterArgs: {
-              buttonIcon: 'fa fa-desktop',
-              url: '/api/v1/assets/assets/{id}',
-              can: () => this.currentUserIsSuperAdmin,
-              connectUrlTemplate: (row) => `/luna/pam_connect/${row.id}/${row.username}/${row.asset.id}/${row.asset.name}/`,
-              setMapItem: (id, protocol) => {
-                this.$store.commit('table/SET_PROTOCOL_MAP_ITEM', {
-                  key: id,
-                  value: protocol
-                })
+              can: ({ row }) => {
+                return this.currentUserIsSuperAdmin
+              }
+            }
+          },
+          ds: {
+            width: '100px',
+            formatter: (row) => {
+              if (row.ds && row.ds['domain_name']) {
+                return row.ds['domain_name']
+              } else {
+                return ''
               }
             }
           },
@@ -229,12 +240,20 @@ export default {
             }
           },
           asset: {
+            minWidth: '100px',
             formatter: function(row) {
               return row.asset.name
             }
           },
           username: {
-            width: '120px'
+            minWidth: '60px',
+            formatter: function(row) {
+              if (row.ds && row.ds['domain_name']) {
+                return `${row.username}@${row.ds['domain_name']}`
+              } else {
+                return row.username
+              }
+            }
           },
           secret_type: {
             formatter: function(row) {

src/components/Apps/UserConfirmDialog/index.vue

@@ -67,13 +67,13 @@
             style="width: 100%; height: 800px;border: none;"
           />
 
-          <span v-if="subTypeSelected === 'sms'" style="margin: -1px 0 0 20px;">
+          <span v-if="subTypeSelected === 'sms' || subTypeSelected === 'email'" style="margin: -1px 0 0 20px;">
             <el-button
               :disabled="smsBtnDisabled"
               size="mini"
               style="line-height: 14px; float: right;"
               type="primary"
-              @click="sendSMSCode"
+              @click="sendCode"
             >
               {{ smsBtnText }}
             </el-button>
@@ -204,8 +204,8 @@ export default {
     logout() {
       window.location.href = `${process.env.VUE_APP_LOGOUT_PATH}?next=${this.$route.fullPath}`
     },
-    sendSMSCode() {
-      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: 'sms' }).then(res => {
+    sendCode() {
+      this.$axios.post(`/api/v1/authentication/mfa/select/`, { type: this.subTypeSelected }).then(res => {
         this.$message.success(this.$tc('VerificationCodeSent'))
         let time = 60
         this.smsBtnDisabled = true

src/components/Form/FormFields/CronTab/Crontab.vue

@@ -361,9 +361,10 @@ export default {
     },
     // 填充表达式
     submitFill() {
+      const minMinutes = 60
       const crontabDiffMin = this.crontabDiff / 1000 / 60
-      if (crontabDiffMin > 0 && crontabDiffMin < 10) {
-        const msg = this.$tc('CrontabDiffError')
+      if (crontabDiffMin > 0 && crontabDiffMin < minMinutes) {
+        const msg = this.$t('CrontabDiffError', { minutes: minMinutes })
         this.$message.error(msg)
         return
       }

src/components/Form/FormFields/CronTab/index.vue

@@ -39,6 +39,13 @@ export default {
       showCron: false
     }
   },
+  watch: {
+    value: {
+      handler(val) {
+        this.crontabFill(val)
+      }
+    }
+  },
   methods: {
     crontabFill(value) {
       // 确定后回传的值

src/components/Table/CardTable/index.vue

@@ -212,9 +212,6 @@ export default {
   ::v-deep {
     .el-empty {
       margin: 0 auto;
-
-      .el-empty__image {
-      }
     }
   }
 }
@@ -226,6 +223,8 @@ export default {
 
   .card-container {
     display: flex;
+    justify-content: left;
+    flex-wrap: wrap;
   }
 
   .el-col, div {

src/components/Table/TableFormatters/AccountConnectFormatter.vue

@@ -1,24 +1,32 @@
 <template>
   <div>
     <el-dropdown
-      v-if="hasPerm"
+      :disabled="!hasPerm"
+      :show-timeout="500"
+      class="action-connect"
       size="small"
       trigger="hover"
-      :show-timeout="500"
-      @command="handleCommand"
+      type="primary"
+      @command="handleProtocolConnect"
       @visible-change="visibleChange"
     >
       <el-button
         plain
         size="mini"
         type="primary"
-        @click="handlePamConnect"
+        @click="handleBtnConnect"
       >
-        <i :class="IButtonIcon" />
+        <i :class="iButtonIcon" />
       </el-button>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item command="Title" disabled>
-          {{ ITitleText }}
+
+      <el-dropdown-menu v-if="!isClick" slot="dropdown">
+        <el-dropdown-item command="title" disabled>
+          <div v-if="getProtocolsLoading">
+            {{ $t('Loading') }}
+          </div>
+          <div v-else>
+            {{ dropdownTitle }}
+          </div>
         </el-dropdown-item>
         <el-dropdown-item divided />
         <el-dropdown-item
@@ -30,16 +38,6 @@
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-
-    <el-button
-      v-else
-      plain
-      size="mini"
-      type="primary"
-      :disabled="!hasPerm"
-    >
-      <i :class="IButtonIcon" style="color: #fff" />
-    </el-button>
   </div>
 </template>
 
@@ -50,85 +48,70 @@ export default {
   name: 'AccountConnectFormatter',
   extends: BaseFormatter,
   props: {
-    buttonIcon: {
-      type: String,
-      default: 'fa fa-desktop'
-    },
-    titleText: {
-      type: String,
-      default: ''
-    },
-    url: {
-      type: String,
-      default: ''
+    formatterArgsDefault: {
+      type: Object,
+      default() {
+        return {
+          can: () => true,
+          getConnectUrl: (row, protocol) => {
+            return `/luna/admin-connect/?
+              asset=${row.asset.id}
+              &account=${row.id}
+              &protocol=${protocol}
+            `.replace(/\s+/g, '')
+          },
+          assetUrl: '/api/v1/assets/assets/{id}/',
+          buttonIcon: 'fa fa-desktop'
+        }
+      }
     }
   },
   data() {
     return {
-      hasPerm: false,
-      protocols: []
+      formatterArgs: Object.assign(this.formatterArgsDefault, this.col.formatterArgs),
+      protocols: [],
+      isClick: false,
+      getProtocolsLoading: false,
+      dropdownTitle: this.$t('Protocols')
     }
   },
   computed: {
-    IButtonIcon() {
-      return this.buttonIcon
+    iButtonIcon() {
+      return this.formatterArgs.buttonIcon
     },
-    ITitleText() {
-      return this.titleText || this.$t('SelectProtocol')
+    hasPerm() {
+      return this.formatterArgs.can({ row: this.row, cellValue: this.cellValue })
     }
   },
-  mounted() {
-    this.hasPerm = this.formatterArgs.can()
-  },
   methods: {
-    handleCommand(protocol) {
-      if (protocol === 'Title') return
-
-      this.formatterArgs.setMapItem(this.row.id, protocol)
-      this.handleWindowOpen(this.row, protocol)
+    handleProtocolConnect(protocol) {
+      const url = this.formatterArgs.getConnectUrl(this.row, protocol)
+      window.open(url, '_blank')
     },
     visibleChange(visible) {
       if (visible) {
         this.getProtocols(this.row.asset.id)
       }
     },
-    handleWindowOpen(row, protocol) {
-      const url = this.formatterArgs.connectUrlTemplate(row) + `${protocol}`
-
-      this.$nextTick(() => {
-        window.open(url, '_blank')
-      })
-    },
-    async handlePamConnect() {
-      const protocolMap = this.$store.getters.protocolMap
-
-      if (protocolMap.has(this.row.id)) {
-        // 直连
-        const protocol = protocolMap.get(this.row.id)
-        this.handleWindowOpen(this.row, protocol)
-      } else {
-        try {
-          const url = this.formatterArgs.url.replace('{id}', this.row.asset.id)
-          const res = await this.$axios.get(url)
-
-          if (res && res.protocols.length > 0) {
-            const protocol = res.protocols.filter(protocol => protocol.name !== 'sftp')[0]
-
-            this.formatterArgs.setMapItem(this.row.id, protocol.name)
-            this.handleWindowOpen(this.row, protocol.name)
-          }
-        } catch (e) {
-          throw new Error(`Error getting protocols: ${e}`)
-        }
+    async handleBtnConnect() {
+      this.isClick = true
+      if (this.protocols === 0) {
+        await this.getProtocols(this.row.asset.id)
       }
+
+      if (this.protocols.length > 0) {
+        this.handleProtocolConnect(this.protocols[0].name)
+      }
+      setTimeout(() => {
+        this.isClick = false
+      }, 1000)
     },
     async getProtocols(assetId) {
+      if (this.protocols.length > 0) return
       try {
-        const url = this.formatterArgs.url.replace('{id}', assetId)
+        const url = this.formatterArgs.assetUrl.replace('{id}', assetId)
         const res = await this.$axios.get(url)
-
-        // 暂将 SFTP 过滤
-        if (res) this.protocols = res.protocols.filter(protocol => protocol.name !== 'sftp')
+        this.protocols = res.protocols || []
       } catch (e) {
         throw new Error(`Error getting protocols: ${e}`)
       }
@@ -137,7 +120,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .el-dropdown-menu__item.is-disabled {
   font-weight: 500;
   color: var(--el-text-color-secondary);

src/components/Table/TableFormatters/AccountInfoFormatter.vue

@@ -10,7 +10,7 @@
         <span>{{ $t('No accounts') }}</span>
       </div>
       <div v-for="account of accountData" :key="account.id" class="detail-item">
-        <span>{{ account.name }}({{ account.username }})</span>
+        <span>{{ getDisplay(account) }}</span>
       </div>
     </div>
     <el-button slot="reference" class="link-btn" plain size="mini" type="primary">
@@ -39,10 +39,20 @@ export default {
     }
   },
   methods: {
+    getDisplay(account) {
+      const { username, name } = account
+      if (username.startsWith('@')) {
+        return name
+      } else if (name === username) {
+        return username
+      } else {
+        return `${name}(${username})`
+      }
+    },
     async getAsyncItems() {
       this.loading = true
       const userId = this.$route.params.id || 'self'
-      const url = `/api/v1/perms/users/${userId}/assets/${this.row.id}`
+      const url = `/api/v1/perms/users/${userId}/assets/${this.row.id}/`
       this.$axios.get(url).then(res => {
         this.accountData = res?.permed_accounts || []
       }).finally(() => {

src/components/Table/TableFormatters/PlatformFormatter.vue

@@ -45,7 +45,7 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .platform-td {
   display: flex;
   flex-wrap: nowrap;
@@ -55,6 +55,7 @@ export default {
   .icon-zone {
     width: 1.5em;
     height: 1.5em;
+    flex-shrink: 0;
 
     .asset-icon {
       height: 100%;
@@ -66,6 +67,10 @@ export default {
 
   .platform-name {
     flex: 1;
+    min-width: 0;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis
   }
 }
 

src/components/Table/TagSearch/index.vue

@@ -320,15 +320,15 @@ export default {
       // this.$emit('tagSearch', this.filterMaps)
 
       // 修改查询参数时改变url中保存的参数
-      if (this.getUrlQuery) {
-        let newQuery = _.cloneDeep(this.$route.query)
-        if (this.filterKey.startsWith('search')) {
-          newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
-        } else {
-          newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
-        }
-        this.$router.replace({ query: newQuery })
-      }
+      // if (this.getUrlQuery) {
+      // let newQuery = _.cloneDeep(this.$route.query)
+      // if (this.filterKey.startsWith('search')) {
+      // newQuery = { ...newQuery, search: encodeURI(this.filterMaps.search) }
+      // } else {
+      // newQuery = { ...newQuery, [this.filterKey]: encodeURI(this.filterValue) }
+      // }
+      // this.$router.replace({ query: newQuery })
+      // }
 
       this.filterKey = ''
       this.filterValue = ''

src/components/Widgets/MarkDown/index.vue

@@ -53,24 +53,24 @@ export default {
       resizeObserver: null,
       span: 12,
       isShow: true,
-      iValue: this.value
+      iValue: this.sanitizeContent(this.value)
     }
   },
   computed: {
     sanitizedValue() {
-      // 转义特殊字符
-      let content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
+      const content = this.iValue.replace(/\\/g, '\\\\').replace(/\$/g, '\\$')
 
-      // 使用 DOMPurify 进行 XSS 过滤
-      content = DOMPurify.sanitize(content)
-
-      return content
+      return this.sanitizeContent(content)
+    }
+  },
+  watch: {
+    value(newVal) {
+      this.iValue = this.sanitizeContent(newVal)
     }
   },
   mounted() {
     this.$nextTick(() => {
       this.resizeObserver = new ResizeObserver(entries => {
-        // 监听高度变化
         const height = entries[0].target.offsetHeight
         if (height) {
           this.height = height
@@ -90,8 +90,19 @@ export default {
     this.resizeObserver = null
   },
   methods: {
+    sanitizeContent(content) {
+      if (!content) return ''
+
+      return DOMPurify.sanitize(content, {
+        ALLOWED_TAGS: ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ul', 'ol', 'li', 'strong', 'em', 'code', 'pre', 'blockquote', 'a'],
+        FORBID_TAGS: ['script', 'style', 'iframe', 'frame', 'object', 'embed'],
+        FORBID_ATTR: ['onerror', 'onload', 'onclick', 'onmouseover']
+      })
+    },
     onChange() {
-      this.$emit('change', this.iValue)
+      const sanitizedValue = this.sanitizeContent(this.iValue)
+      this.iValue = sanitizedValue
+      this.$emit('change', sanitizedValue)
     },
     onView() {
       this.isShow = !this.isShow

src/components/const.js

@@ -38,10 +38,20 @@ export const crontab = {
     return formValue.is_periodic === false
   },
   helpText: i18n.t('CrontabHelpText'),
-  helpTip: i18n.t('CrontabHelpTip')
+  helpTip: i18n.t('CrontabHelpTip'),
+  on: {
+    change: (val, updateForm) => {
+      updateForm({
+        interval: ''
+      })
+    }
+  }
 }
 
 const validatorInterval = (rule, value, callback) => {
+  if (value === '') {
+    return callback()
+  }
   if (parseInt(value) < 1) {
     return callback(new Error(i18n.t('EnsureThisValueIsGreaterThanOrEqualTo1')))
   }
@@ -59,7 +69,15 @@ export const interval = {
   },
   rules: [
     { validator: validatorInterval }
-  ]
+  ],
+  on: {
+    input: (val, updateForm) => {
+      console.log('interval input', val)
+      updateForm({
+        crontab: ''
+      })
+    }
+  }
 }
 
 export const is_periodic = {

src/layout/components/NavHeader/Help.vue

@@ -51,7 +51,7 @@ export default {
           window.open(this.URLSite.HELP_SUPPORT_URL, '_blank')
           break
         case 'enterprise':
-          window.open('https://jumpserver.org/enterprise.html', '_blank')
+          window.open('https://www.jumpserver.com/#section-edition', '_blank')
           break
         case 'about':
           this.visible = true

src/layout/components/Page/index.vue

@@ -38,14 +38,14 @@
             <div class="disabled-text">
               {{ $t('UpgradeEnterpriseEditionHelpText') }}
             </div>
-            <el-button class="upgrade-btn" type="primary">
+            <el-button class="upgrade-btn" type="primary" @click="handleUpgrade">
               {{ $t('UpgradeEnterpriseEdition') }}
             </el-button>
           </div>
         </IBox>
       </div>
-      <el-alert v-if="helpMessage" type="success">
-        <span v-sanitize="helpMessage" class="announcement-main" />
+      <el-alert v-if="iHelpMessage" type="success">
+        <span v-sanitize="iHelpMessage" class="announcement-main" />
       </el-alert>
       <slot />
     </PageContent>
@@ -119,6 +119,9 @@ export default {
         return true
       }
       return window.history.length <= 2
+    },
+    iHelpMessage() {
+      return this.helpMessage || this.helpTip
     }
   },
   methods: {
@@ -136,7 +139,7 @@ export default {
       clearTimeout(this.longPressTimer)
     },
     handleUpgrade() {
-      const url = 'http://www.jumpserver.org/support/'
+      const url = 'https://www.lxware.hk/pages/about'
       window.open(url, '_blank')
     }
   }
@@ -153,8 +156,8 @@ export default {
   overflow-x: hidden;
 
   .el-alert {
-    margin-top: -5px;
-    margin-bottom: 5px;
+    margin: -5px 0 5px 0!important;
+    width: calc(100% - 10px);
   }
 
   .page-content {

src/router/console/acls.js

@@ -25,7 +25,8 @@ export default [
           title: i18n.t('UserLoginACLs'),
           app: 'acls',
           resource: 'loginacl',
-          disableOrgsChange: true
+          disableOrgsChange: true,
+          licenseRequired: true
         },
         children: [
           {

src/store/modules/assets.js

@@ -89,6 +89,9 @@ const actions = {
         })
     })
   },
+  cleanPlatforms({ commit, dispatch, state }) {
+    state.platforms = []
+  },
   addToRecentPlatforms({ commit, display, state }, platform) {
     const recentPlatformIds = state.recentPlatformIds.filter(i => i !== platform.id)
     recentPlatformIds.unshift(platform.id)

src/store/modules/settings.js

@@ -29,6 +29,9 @@ const mutations = {
       state.hasValidLicense = settings['XPACK_LICENSE_IS_VALID']
     }
   },
+  SET_SECURITY_WATERMARK_ENABLED: (state, value) => {
+    state.publicSettings['SECURITY_WATERMARK_ENABLED'] = value
+  },
   setTheme(state, data) {
     state.themeColors = data
     localStorage.setItem('themeColors', JSON.stringify(data))

src/utils/startup.js

@@ -138,13 +138,20 @@ export async function generatePageRoutes({ to, from, next }) {
 }
 
 export async function checkUserFirstLogin({ to, from, next }) {
+  // 防止递归调用
+  if (to.path === '/profile/improvement') return true
   if (store.state.users.profile.is_first_login) {
-    next('/profile/improvement')
-  }
-  const nextRoute = localStorage.getItem('next')
-  if (nextRoute) {
-    localStorage.setItem('next', '')
-    next(nextRoute.replace('#', ''))
+    next({
+      name: 'Improvement',
+      replace: true,
+      query: { _t: Date.now() } // 添加时间戳，防止 from 一样 next 不触发 guard.js router.beforeEach逻辑
+    })
+  } else {
+    const nextRoute = localStorage.getItem('next')
+    if (nextRoute) {
+      localStorage.setItem('next', '')
+      next(nextRoute.replace('#', ''))
+    }
   }
 }
 
@@ -188,6 +195,8 @@ function onI18nLoaded() {
 export async function startup({ to, from, next }) {
   // if (store.getters.inited) { return true }
   if (store.getters.inited) {
+    // 页面初始化后也需要检测
+    await checkUserFirstLogin({ to, from, next })
     return true
   }
 

src/views/accounts/AccountBackup/AccountBackupList.vue

@@ -56,18 +56,9 @@ export default {
             }
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: vm.$hasPerm('accounts.view_backupaccountexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountBackupList',
-                  query: {
-                    tab: 'AccountBackupExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_backupaccountexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -104,6 +95,17 @@ export default {
         hasImport: false
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountBackupList',
+        query: {
+          tab: 'AccountBackupExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountBackup/index.vue

@@ -40,6 +40,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>

src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue

@@ -61,19 +61,9 @@ export default {
             width: '180px'
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'AccountDiscoverList',
-              can: vm.$hasPerm('accounts.view_changesecretexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountChangeSecretDetail',
-                  query: {
-                    tab: 'AccountChangeSecretExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_changesecretexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -114,6 +104,17 @@ export default {
         createRoute: 'AccountChangeSecretCreate'
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountChangeSecretList',
+        query: {
+          tab: 'AccountChangeSecretExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountDiscover/AccountDiscoverTaskList.vue

@@ -69,19 +69,9 @@ export default {
           },
           periodic_display: {},
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              route: 'AccountDiscoverList',
-              can: vm.$hasPerm('accounts.view_gatheraccountsexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountDiscoverList',
-                  query: {
-                    tab: 'AccountDiscoverTaskExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_gatheraccountsexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -124,6 +114,17 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountDiscoverList',
+        query: {
+          tab: 'AccountDiscoverTaskExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/accounts/AccountPush/AccountPushList.vue

@@ -64,18 +64,9 @@ export default {
             showOverflowTooltip: true
           },
           executed_amount: {
-            formatter: DetailFormatter,
-            formatterArgs: {
-              can: vm.$hasPerm('accounts.view_pushaccountexecution'),
-              getRoute({ row }) {
-                return {
-                  name: 'AccountPushList',
-                  query: {
-                    tab: 'AccountPushExecutionList',
-                    automation_id: row.id
-                  }
-                }
-              }
+            formatter: (row) => {
+              const can = vm.$hasPerm('accounts.view_pushaccountexecution')
+              return <el-link onClick={ () => this.handleExecAmount(row) } disabled={ !can }>{ row.executed_amount }</el-link>
             }
           },
           actions: {
@@ -116,6 +107,17 @@ export default {
         createRoute: 'AccountPushCreate'
       }
     }
+  },
+  methods: {
+    handleExecAmount(row) {
+      this.$router.push({
+        name: 'AccountPushList',
+        query: {
+          tab: 'AccountPushExecutionList',
+          automation_id: row.id
+        }
+      })
+    }
   }
 }
 </script>

src/views/assets/Asset/AssetCreateUpdate/BaseAssetCreateUpdate.vue

@@ -47,7 +47,9 @@ export default {
     return {
       loading: true,
       platform: {},
-      changePlatformID: '',
+      initing: false,
+      // 在 meta 中，可能改变 platform id
+      platformID: this.$route.query.platform || '',
       meta: {},
       iConfig: {},
       defaultConfig: {
@@ -67,7 +69,7 @@ export default {
         fieldsMeta: {},
         performSubmit(validValues) {
           let url = this.url
-          const { id = '' } = this.$route.query
+          const { id = '' } = this.$route.params
           const values = _.cloneDeep(validValues)
           const submitMethod = id ? 'put' : 'post'
 
@@ -95,21 +97,28 @@ export default {
   },
   methods: {
     async init() {
+      // 更改平台时，就不重新 loading 了
+      this.$log.debug('Initing asset base upcate create', this.initing)
+      if (this.initing) {
+        return
+      }
+      this.initing = true
       try {
         await this.genConfig()
         await this.setInitial()
         await this.setPlatformConstrains()
       } finally {
+        this.initing = false
         this.loading = false
       }
     },
     async genConfig() {
       const { addFields, addFieldsMeta, defaultConfig } = this
-      defaultConfig.fieldsMeta = assetFieldsMeta(this, this.$route.query.type)
+      defaultConfig.fieldsMeta = assetFieldsMeta(this)
       let url = this.url
-      const { id = '', platform } = this.$route.query
-      if (platform && !id) {
-        url = setUrlParam(url, 'platform', platform)
+      const id = this.$route.params.id
+      if (!id) {
+        url = setUrlParam(url, 'platform', this.platformID)
       }
       // 过滤类型为：null, undefined 的元素
       defaultConfig.fields = defaultConfig.fields.filter(Boolean)
@@ -134,9 +143,9 @@ export default {
     },
     async setInitial() {
       const { defaultConfig } = this
-      const { node, platform } = this.$route.query
+      const { node } = this.$route.query
       const nodesInitial = node ? [node] : []
-      const platformId = this.changePlatformID || this.$route.query.platform || (platform || 'Linux')
+      const platformId = this.platformID || 'Linux'
       const url = `/api/v1/assets/platforms/${platformId}/`
       this.platform = await this.$axios.get(url)
       const initial = {
@@ -165,13 +174,6 @@ export default {
       const protocolChoices = this.iConfig.fieldsMeta.protocols.el.choices
       protocolChoices.splice(0, protocolChoices.length, ...protocols)
       this.iConfig.fieldsMeta.accounts.el.platform = platform
-      const hiddenCheckFields = ['protocols', 'domain']
-
-      for (const field of hiddenCheckFields) {
-        if (platform[field + '_enabled'] === false) {
-          this.iConfig.fieldsMeta[field].hidden = () => true
-        }
-      }
     }
   }
 }

src/views/assets/Asset/AssetCreateUpdate/DSCreateUpdate.vue

@@ -0,0 +1,23 @@
+<template>
+  <BaseAssetCreateUpdate v-bind="$data" />
+</template>
+
+<script>
+import BaseAssetCreateUpdate from './BaseAssetCreateUpdate'
+
+export default {
+  name: 'DSCreateUpdate',
+  components: { BaseAssetCreateUpdate },
+  data() {
+    return {
+      url: '/api/v1/assets/directories/',
+      addFields: [
+        [this.$t('IdentityDomain'), ['domain_name'], 1]
+      ]
+    }
+  }
+}
+</script>
+
+<style>
+</style>

src/views/assets/Asset/AssetDetail/Account.vue

@@ -59,7 +59,7 @@ export default {
     return {
       title: this.$t('Test'),
       templateDialogVisible: false,
-      columnsDefault: ['name', 'username', 'asset', 'connect'],
+      columnsDefault: ['name', 'username', 'connect'],
       headerExtraActions: [
         {
           name: this.$t('AccountTemplate'),
@@ -96,7 +96,7 @@ export default {
   },
   computed: {
     iUrl() {
-      return this.url || `/api/v1/accounts/accounts/?asset=${this.object.id}`
+      return this.url || `/api/v1/assets/assets/${this.object.id}/accounts/`
     }
   },
   methods: {

src/views/assets/Asset/AssetList/DSList.vue

@@ -0,0 +1,21 @@
+<template>
+  <BaseList v-bind="tableConfig" />
+</template>
+
+<script>
+import BaseList from './components/BaseList'
+
+export default {
+  components: {
+    BaseList
+  },
+  data() {
+    return {
+      tableConfig: {
+        category: 'ds',
+        url: '/api/v1/assets/directories/'
+      }
+    }
+  }
+}
+</script>

src/views/assets/Asset/AssetList/components/BaseList.vue

@@ -143,7 +143,8 @@ export default {
         'custom': () => import('@/views/assets/Asset/AssetCreateUpdate/CustomCreateUpdate.vue'),
         'cloud': () => import('@/views/assets/Asset/AssetCreateUpdate/CloudCreateUpdate.vue'),
         'device': () => import('@/views/assets/Asset/AssetCreateUpdate/DeviceCreateUpdate.vue'),
-        'database': () => import('@/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue')
+        'database': () => import('@/views/assets/Asset/AssetCreateUpdate/DatabaseCreateUpdate.vue'),
+        'ds': () => import('@/views/assets/Asset/AssetCreateUpdate/DSCreateUpdate.vue')
       },
       createProps: {},
       showPlatform: false,
@@ -216,16 +217,19 @@ export default {
   methods: {
     async updateOrCloneAsset(row, action) {
       this.createDrawer = this.drawer[row.category.value]
-      const meta = {
-        action: action,
-        id: row.id,
+
+      const query = {
         platform: row.platform.id,
         type: row.type.value,
         category: row.category.value,
-        row: row,
-        payload: row.payload
+        action: action
       }
-      this.$refs.ListTable.onUpdate({ row, query: meta })
+
+      if (action === 'clone') {
+        return this.$refs.ListTable.onClone({ row, query })
+      }
+
+      this.$refs.ListTable.onUpdate({ row, query })
     },
     createAsset(platform) {
       this.showPlatform = false

src/views/assets/Asset/AssetList/components/PlatformDialog.vue

@@ -5,7 +5,7 @@
     :show-confirm="false"
     :title="$tc('SelectPlatform')"
     :visible.sync="iVisible"
-    size="600px"
+    size="700px"
     top="1vh"
   >
     <template #title>
@@ -61,6 +61,7 @@ import { loadPlatformIcon } from '@/utils/jms'
 
 export default {
   name: 'PlatformDrawer',
+  components: {},
   props: {
     visible: {
       type: Boolean,
@@ -76,7 +77,7 @@ export default {
       platforms: [],
       recentPlatformIds: [],
       loading: true,
-      activeType: 'host',
+      activeType: [],
       recentUsedLabel: this.$t('RecentlyUsed'),
       typeIconMapper: {
         linux: 'fa-linux',
@@ -130,9 +131,7 @@ export default {
   async created() {
     this.platforms = await this.$store.dispatch('assets/getPlatforms')
     this.allRecentPlatforms = await this.$store.dispatch('assets/getRecentPlatforms')
-    if (this.allRecentPlatforms.length > 0) {
-      this.activeType = this.recentUsedLabel
-    }
+    this.activeType = Object.keys(this.iPlatforms)[0]
     this.loading = false
   },
   methods: {

src/views/assets/Asset/AssetList/components/const.js

@@ -194,7 +194,7 @@ export function getDefaultConfig(vm) {
         formatter: ActionsFormatter,
         formatterArgs: {
           onUpdate: ({ row }) => onAction(row, 'Update'),
-          onClone: ({ row }) => onAction({ ...row, payload: 'pam_asset_clone' }, 'Clone'),
+          onClone: ({ row }) => onAction(row, 'Clone'),
           performDelete: ({ row }) => {
             const id = row.id
             const url = `/api/v1/assets/assets/${id}/`

src/views/assets/Asset/AssetList/index.vue

@@ -56,6 +56,12 @@ export default {
             hidden: true,
             component: () => import('@/views/assets/Asset/AssetList/WebList.vue')
           },
+          {
+            icon: 'fa-id-card-o',
+            name: 'ds',
+            hidden: true,
+            component: () => import('@/views/assets/Asset/AssetList/DSList.vue')
+          },
           {
             icon: 'fa-comment',
             name: 'gpt',

src/views/assets/Cloud/Account/AccountDetail/TaskSyncAssetList.vue

@@ -41,7 +41,7 @@ export default {
         ]
       },
       tableConfig: {
-        url: `/api/v1/xpack/cloud/sync-instance-tasks/${this.object.task?.id}/instances/`,
+        url: '',
         hasSelection: false,
         columns: [
           'instance_id',
@@ -49,6 +49,10 @@ export default {
             prop: 'asset_ip',
             label: this.$t('IP')
           },
+          {
+            prop: 'asset_display',
+            label: this.$t('Asset')
+          },
           'region',
           {
             prop: 'status',
@@ -76,9 +80,20 @@ export default {
       }
     }
   },
+  computed: {
+    dynamicUrl() {
+      const baseUrl = '/api/v1/xpack/cloud/sync-instance-tasks/instances/'
+      return this.object ? `${baseUrl}?task_id=${this.object.task.id}` : baseUrl
+    }
+  },
+  mounted() {
+    this.tableConfig.url = this.dynamicUrl
+  },
   methods: {
     DeleteReleasedAssets() {
-      this.$axios.delete(`/api/v1/xpack/cloud/sync-instance-tasks/${this.object.task?.id}/released-assets/`).then(
+      const baseUrl = '/api/v1/xpack/cloud/sync-instance-tasks/released-assets/'
+      const url = this.object ? `${baseUrl}?task_id=${this.object.task.id}` : baseUrl
+      this.$axios.delete(url).then(
         res => {
           this.$message.success(this.$tc('DeleteSuccessMsg'))
           this.$refs.GenericListTable.$refs.ListTable.reloadTable()

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

@@ -33,7 +33,11 @@ export default {
               <ul>
                 {
                   newArr.map((r, index) => {
-                    return <li key={index}>{`${r.attr.label} ${r.match.label} ${r.value}`} </li>
+                    return <li>
+                      <el-tag size='mini' key={index}>
+                        {r.attr.label}<strong> {`${r.match.label}`} </strong>{r.value}
+                      </el-tag>
+                    </li>
                   })
                 }
               </ul>
@@ -48,7 +52,11 @@ export default {
               <ul>
                 {
                   newArr.map((a, index) => {
-                    return <li key={index}>{`${a.attr.label}: ${a.value.label}`} </li>
+                    return <li>
+                      <el-tag size='mini' key={index}>
+                        <strong>{a.attr.label}: </strong>{`${a.value.label}`}
+                      </el-tag>
+                    </li>
                   })
                 }
               </ul>
@@ -58,42 +66,21 @@ export default {
         'comment', 'org_name'
       ]
     }
-  },
-  computed: {
-    cardTitle() {
-      return this.object.name
-    }
   }
 }
 </script>
 
 <style scoped>
 ul {
-  counter-reset: my-counter;
-  list-style-type: none;
+  display: flex;
+  flex-direction: column;
   margin: 0;
   padding: 0;
 }
 
 li {
-  counter-increment: my-counter;
-  position: relative;
-  padding-left: 20px;
-}
-
-li:before {
-  content: counter(my-counter);
-  display: block;
-  position: absolute;
-  left: 0;
-  top: 32%;
-  width: 14px;
-  height: 14px;
-  line-height: 12px;
-  text-align: center;
-  border: 1px solid;
-  border-radius: 50%;
-  background-color: #fff;
+  list-style: none;
+  margin: 3px 0;
 }
 </style>
 

src/views/assets/Cloud/index.vue

@@ -26,6 +26,12 @@ export default {
             name: 'StrategyList',
             hidden: () => !this.$hasPerm('xpack.view_strategy'),
             component: () => import('@/views/assets/Cloud/Strategy/StrategyList.vue')
+          },
+          {
+            title: this.$t('SyncInstanceTaskHistoryAssetList'),
+            name: 'TaskSyncAssetList',
+            hidden: () => !this.$hasLicense() || !this.$hasPerm('xpack.view_syncinstancedetail'),
+            component: () => import('@/views/assets/Cloud/Account/AccountDetail/TaskSyncAssetList.vue')
           }
         ],
         actions: {

src/views/assets/Platform/PlatformCreateUpdate.vue

@@ -11,6 +11,7 @@
       :has-reset="false"
       :initial="initial"
       :url="url"
+      @submitSuccess="onSubmitSuccess"
     />
   </div>
 </template>
@@ -49,7 +50,8 @@ export default {
         ]],
         [this.$t('Config'), [
           'protocols', 'su_enabled', 'su_method',
-          'domain_enabled', 'charset'
+          'domain_enabled', 'ds_enabled', 'ds',
+          'charset'
         ]],
         [this.$t('Automations'), ['automation']],
         [this.$t('Other'), ['comment']]
@@ -105,6 +107,9 @@ export default {
     }
   },
   methods: {
+    onSubmitSuccess() {
+      this.$store.dispatch('assets/cleanPlatforms')
+    },
     updateSuMethodOptions() {
       const options = this.suMethods.filter(i => {
         return this.suMethodLimits.includes(i.value)
@@ -141,7 +146,6 @@ export default {
       const constraints = await this.$axios.get(url)
       this.defaultOptions = constraints
 
-      const fieldsCheck = ['domain_enabled', 'su_enabled']
       let protocols = constraints?.protocols || []
       protocols = protocols?.map(i => {
         if (i.name === 'http') {
@@ -151,15 +155,20 @@ export default {
       })
       this.fieldsMeta.protocols.el.choices = protocols
 
+      const fieldsCheck = ['domain_enabled', 'su_enabled']
       for (const field of fieldsCheck) {
         const disabled = constraints[field] === false
         this.initial[field] = !disabled
         _.set(this.fieldsMeta, `${field}.el.disabled`, disabled)
       }
 
-      if (constraints['charset_enabled'] === false) {
-        this.fieldsMeta.charset.hidden = () => true
+      const fieldsHidden = ['charset_enabled', 'ds_enabled']
+      for (const field of fieldsHidden) {
+        if (constraints[field] === false) {
+          this.fieldsMeta[field].hidden = () => true
+        }
       }
+
       await setAutomations(this)
       await this.updateSuMethods(constraints)
     }

src/views/assets/Platform/PlatformList.vue

@@ -115,7 +115,11 @@ export default {
               canUpdate: ({ row }) => !row.internal && vm.$hasPerm('assets.change_platform'),
               canDelete: ({ row }) => !row.internal && vm.$hasPerm('assets.delete_platform'),
               onUpdate({ row, col }) {
-                vm.$refs.genericListTable.onUpdate({ row, col, query: { type: row.type.value, category: row.category.value }})
+                vm.$refs.genericListTable.onUpdate({
+                  row,
+                  col,
+                  query: { type: row.type.value, category: row.category.value }
+                })
               }
             }
           }
@@ -149,14 +153,7 @@ export default {
       return `/api/v1/assets/platforms/?category=${this.tab.activeMenu}`
     }
   },
-  deactivated() {
-    window.localStorage.setItem('lastTab', this.tab.activeMenu)
-  },
   activated() {
-    setTimeout(() => {
-      this.tab.activeMenu = window.localStorage.getItem('lastTab') || 'host'
-      this.$refs.genericListTable?.reloadTable()
-    }, 300)
   },
   async mounted() {
     try {
@@ -173,9 +170,15 @@ export default {
       this.tableConfig.url = this.url
       this.headerActions.importOptions.url = this.url
       this.headerActions.exportOptions.url = this.url
-      this.headerActions.moreCreates.dropdown = this.$store.state.assets.assetCategoriesDropdown.filter(item => {
+      const types = this.$store.state.assets.assetCategoriesDropdown.filter(item => {
         return item.category === this.tab.activeMenu
+      }).map(item => {
+        if (item.group && !item.group.includes(this.$t('Type'))) {
+          item.group += this.$t('WordSep') + this.$t('Type')
+        }
+        return item
       })
+      this.headerActions.moreCreates.dropdown = types
     },
     async setCategoriesTab() {
       const categoryIcon = {
@@ -185,6 +188,7 @@ export default {
         cloud: 'fa-cloud',
         web: 'fa-globe',
         gpt: 'fa-comment',
+        ds: 'fa-id-card-o',
         custom: 'fa-cube'
       }
       const state = await this.$store.dispatch('assets/getAssetCategories')

src/views/assets/Platform/const.js

@@ -81,6 +81,19 @@ export const platformFieldsMeta = (vm) => {
         disabled: false
       }
     },
+    ds_enabled: {
+      el: {
+        disabled: false
+      }
+    },
+    ds: {
+      el: {
+        multiple: false,
+        url: '/api/v1/assets/directories/',
+        disabled: false
+      },
+      hidden: (formValue) => !formValue['ds_enabled']
+    },
     protocols: {
       label: i18n.t('SupportedProtocol'),
       ...assetMeta.protocols,

src/views/assets/Platform/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es5",
-    "sourceMap": true
-  },
-  "exclude": [
-    "node_modules"
-  ]
-}

src/views/assets/const.js

@@ -26,12 +26,12 @@ export const filterSelectValues = (values) => {
   return selects
 }
 
-function updatePlatformProtocols(vm, platformType, updateForm, isPlatformChanged = false) {
+function updatePlatformProtocols(vm, platformType, updateForm, platformChanged = false) {
   setTimeout(() => vm.init().then(() => {
-    const isCreate = vm?.$route?.meta.action === 'create' && vm?.$route?.query.clone_from === undefined
-    const need_modify = isCreate || isPlatformChanged
+    const isCreate = vm.$route.query.action === 'create' && vm?.$route?.query.clone_from === undefined
+    const needModify = isCreate || platformChanged
     const platformProtocols = vm.platform.protocols
-    if (!need_modify) return
+    if (!needModify) return
     if (platformType === 'website') {
       const setting = Array.isArray(platformProtocols) ? platformProtocols[0].setting : platformProtocols.setting
       updateForm({
@@ -48,7 +48,9 @@ function updatePlatformProtocols(vm, platformType, updateForm, isPlatformChanged
   }), 100)
 }
 
-export const assetFieldsMeta = (vm, platformType) => {
+export const assetFieldsMeta = (vm, category, type) => {
+  const platformCategory = category || vm.$route.query.category
+  const platformType = type || vm.$route.query.type
   const platformProtocols = []
   const secretTypes = []
   const asset = { address: 'https://jumpserver:330' }
@@ -92,28 +94,22 @@ export const assetFieldsMeta = (vm, platformType) => {
       el: {
         multiple: false,
         ajax: {
-          url: `/api/v1/assets/platforms/?type=${platformType}`,
+          url: `/api/v1/assets/platforms/?category=${platformCategory}&type=${platformType}`,
           transformOption: (item) => {
             return { label: item.name, value: item.id }
           }
         }
       },
       on: {
-        change: ([event], updateForm) => {
+        change: _.debounce(([event], updateForm) => {
           const pk = event.pk
-          const url = window.location.href
-          vm.changePlatformID = pk
-          if (url.includes('clone')) {
-            updatePlatformProtocols(vm, platformType, updateForm, true)
-          } else {
-            vm.$nextTick(() => {
-              updatePlatformProtocols(vm, platformType, updateForm, true)
-            })
-          }
-        },
-        input: ([event], updateForm) => {
+          vm.platformID = pk
+          updatePlatformProtocols(vm, platformType, updateForm, true)
+        }, 200),
+        input: _.debounce(([event], updateForm) => {
+          // 初始化的时候，mounted 中没有这个逻辑
           updatePlatformProtocols(vm, platformType, updateForm)
-        }
+        }, 200)
       }
     },
     domain: {
@@ -125,6 +121,9 @@ export const assetFieldsMeta = (vm, platformType) => {
         ajax: {
           url: '/api/v1/assets/domains/'
         }
+      },
+      hidden: () => {
+        return vm.platform.domain_enabled === false
       }
     },
     accounts: {

src/views/audits/JobPeriodTaskList.vue

@@ -18,13 +18,13 @@ export default {
       tableConfig: {
         url: '/api/v1/audits/jobs/',
         columnsShow: {
-          min: ['name', 'material'],
+          min: ['name', 'args'],
           default: [
-            'name', 'material', 'type', 'crontab', 'interval', 'created_by', 'is_periodic_display', 'is_periodic'
+            'name', 'args', 'type', 'crontab', 'interval', 'created_by', 'is_periodic_display', 'is_periodic'
           ]
         },
         columns: [
-          'name', 'args', 'material', 'type', 'crontab', 'interval', 'date_last_run', 'summary',
+          'name', 'args', 'type', 'crontab', 'interval', 'date_last_run', 'summary',
           'created_by', 'is_periodic_display', 'is_periodic'
         ],
         columnsMeta: {
@@ -34,10 +34,6 @@ export default {
           name: {
             formatter: (row) => row.name
           },
-          material: {
-            width: '200px',
-            label: this.$t('Command')
-          },
           summary: {
             width: '130px',
             label: `${this.$t('Success')}/${this.$t('Total')}`,

src/views/profile/Improvement.vue

@@ -39,7 +39,10 @@ export default {
           disabled: true
         },
         phone: {
-          component: PhoneInput
+          component: PhoneInput,
+          hidden: () => {
+            return store.getters.publicSettings['PRIVACY_MODE']
+          }
         },
         mfa_level: {
           disabled: (formValue) => {

src/views/profile/index.vue

@@ -24,7 +24,7 @@
           style="margin-top: 15px"
           type="warning"
         />
-        <IBox :title="$tc('InformationModification')" fa="fa-edit">
+        <IBox v-if="!store.getters.publicSettings['PRIVACY_MODE']" :title="$tc('InformationModification')" fa="fa-edit">
           <table>
             <tr>
               <td> {{ $t('Phone') }}</td>
@@ -86,7 +86,8 @@ export default {
         {
           title: this.$t('FacialFeatures'),
           has: this.$store.getters.publicSettings.FACE_RECOGNITION_ENABLED &&
-            this.$store.getters.publicSettings.XPACK_LICENSE_EDITION_ULTIMATE,
+            this.$store.getters.publicSettings.XPACK_LICENSE_EDITION_ULTIMATE &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           attrs: {
             type: 'primary',
             label: this.$store.state.users.profile.is_face_code_set ? this.$t('Unbind') : this.$t('Bind')
@@ -111,7 +112,8 @@ export default {
             showTip: this.isDisabled('wecom'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_WECOM,
+          has: this.$store.getters.publicSettings.AUTH_WECOM &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'wecom'
@@ -128,7 +130,8 @@ export default {
             showTip: this.isDisabled('dingtalk'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_DINGTALK,
+          has: this.$store.getters.publicSettings.AUTH_DINGTALK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'dingtalk'
@@ -145,7 +148,8 @@ export default {
             showTip: this.isDisabled('feishu'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_FEISHU,
+          has: this.$store.getters.publicSettings.AUTH_FEISHU &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'feishu'
@@ -162,7 +166,8 @@ export default {
             showTip: this.isDisabled('lark'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_LARK,
+          has: this.$store.getters.publicSettings.AUTH_LARK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'lark'
@@ -179,7 +184,8 @@ export default {
             showTip: this.isDisabled('slack'),
             tip: this.$t('UnbindHelpText')
           },
-          has: this.$store.getters.publicSettings.AUTH_SLACK,
+          has: this.$store.getters.publicSettings.AUTH_SLACK &&
+            !store.getters.publicSettings['PRIVACY_MODE'],
           callbacks: {
             click: function() {
               this.currentEdit = 'slack'
@@ -314,6 +320,9 @@ export default {
     }
   },
   computed: {
+    store() {
+      return store
+    },
     detailCardItems() {
       return [
         {
@@ -337,7 +346,8 @@ export default {
             } else {
               return '-'
             }
-          }
+          },
+          has: !store.getters.publicSettings['PRIVACY_MODE']
         },
         {
           value: this.object.groups?.map(item => item.name).join(' ｜ '),

src/views/settings/Applet/Applet/AppletList.vue

@@ -57,6 +57,9 @@ export default {
       }
     }
   },
+  mounted() {
+    this.$store.dispatch('users/enterSettingOrg')
+  },
   methods: {
     handleUpload(res) {
       this.$refs.CardTable.reloadTable()

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

@@ -75,6 +75,7 @@ export default {
     }
   },
   async mounted() {
+    this.$route.query.platform = 'RemoteAppHost'
     this.loading = false
   },
   methods: {}

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

@@ -23,6 +23,7 @@ export default {
     DrawerListTable
   },
   data() {
+    const appletRouteQuery = { type: 'windows', category: 'host', platform: 'RemoteAppHost' }
     return {
       createDrawer: () => import('./AppletHostCreateUpdate.vue'),
       detailDrawer: () => import('./AppletHostDetail/index.vue'),
@@ -68,6 +69,9 @@ export default {
                 const url = `/api/v1/terminal/applet-hosts/${id}/`
                 return this.$axios.delete(url)
               },
+              onUpdate: ({ row }) => {
+                this.$refs.table.onUpdate({ row: row, query: appletRouteQuery })
+              },
               extraActions: [
                 {
                   name: 'Test',
@@ -93,7 +97,7 @@ export default {
         hasExport: false,
         hasImport: false,
         onCreate: () => {
-          this.$refs.table.onCreate({ type: 'windows', category: 'host', platform: 'RemoteAppHost' })
+          this.$refs.table.onCreate({ query: appletRouteQuery })
         }
       }
     }

src/views/settings/Auth/Ldap/ImportDialog.vue

@@ -46,7 +46,7 @@
 <script>
 import store from '@/store'
 import { DEFAULT_ORG_ID, SYSTEM_ORG_ID } from '@/utils/org'
-import { DrawerListTable as ListTable } from '@/components'
+import ListTable from '@/components/Table/ListTable'
 import Dialog from '@/components/Dialog/index.vue'
 import Select2 from '@/components/Form/FormFields/Select2.vue'
 import getStatusColumnMeta from '@/components/Table/ListTable/TableAction/const'

src/views/settings/Auth/Ldap/Ldap.vue

@@ -51,7 +51,7 @@ export default {
         [
           this.$t('Other'),
           [
-            'AUTH_LDAP_CONNECT_TIMEOUT', 'AUTH_LDAP_SEARCH_PAGED_SIZE',
+            'AUTH_LDAP_STRICT_SYNC', 'AUTH_LDAP_CONNECT_TIMEOUT', 'AUTH_LDAP_SEARCH_PAGED_SIZE',
             'AUTH_LDAP_CACHE_TIMEOUT'
           ]
         ]

src/views/settings/Auth/Ldap/LdapHA.vue

@@ -51,7 +51,7 @@ export default {
         [
           this.$t('Other'),
           [
-            'AUTH_LDAP_HA_CONNECT_TIMEOUT', 'AUTH_LDAP_HA_SEARCH_PAGED_SIZE',
+            'AUTH_LDAP_HA_STRICT_SYNC', 'AUTH_LDAP_HA_CONNECT_TIMEOUT', 'AUTH_LDAP_HA_SEARCH_PAGED_SIZE',
             'AUTH_LDAP_HA_CACHE_TIMEOUT'
           ]
         ]

src/views/settings/License.vue

@@ -159,7 +159,7 @@ export default {
       this.dialogLicenseImport = true
     },
     consultAction: function() {
-      const url = 'http://www.jumpserver.org/support/'
+      const url = 'https://www.lxware.hk/pages/about'
       window.open(url, '_blank')
     },
     importLicense() {

src/views/settings/Org/OrganizationList.vue

@@ -58,7 +58,7 @@ export default {
             width: '100px'
           },
           'resource_statistics.groups_amount': {
-            label: this.$t('Groups'),
+            label: this.$t('UserGroups'),
             width: '100px'
           },
           'resource_statistics.assets_amount': {

src/views/settings/Security/Auth.vue

@@ -31,6 +31,7 @@ export default {
             [
               'SECURITY_MFA_AUTH',
               'SECURITY_MFA_IN_LOGIN_PAGE',
+              'SECURITY_MFA_BY_EMAIL',
               'SECURITY_MFA_AUTH_ENABLED_FOR_THIRD_PARTY',
               'SECURITY_MFA_VERIFY_TTL',
               'OTP_ISSUER_NAME', 'OTP_VALID_WINDOW'

src/views/settings/Security/Session.vue

@@ -29,13 +29,23 @@ export default {
             ]
           ]
         ],
-        fieldsMeta: {}
+        fieldsMeta: {},
+        onSubmit: async(validValues) => {
+          const url = '/api/v1/settings/setting/?category=security_session'
+
+          try {
+            const res = await this.$axios.patch(url, validValues)
+
+            if (res) {
+              this.$message.success(this.$t('UpdateSuccessMsg'))
+              this.$store.commit('settings/SET_SECURITY_WATERMARK_ENABLED', res['SECURITY_WATERMARK_ENABLED'])
+            }
+          } catch (error) {
+            throw new Error(error)
+          }
+        }
       }
     }
   }
 }
 </script>
-
-<style scoped>
-
-</style>

src/views/settings/Terminal/Endpoint/EndpointList.vue

@@ -31,7 +31,7 @@ export default {
             'name', 'host', 'actions',
             'http_port', 'https_port', 'ssh_port', 'rdp_port', 'vnc_port',
             'mysql_port', 'mariadb_port', 'postgresql_port',
-            'redis_port', 'sqlserver_port', 'oracle_port_range', 'is_active'
+            'redis_port', 'sqlserver_port', 'oracle_port', 'is_active'
           ]
         },
         columnsMeta: {

src/views/users/User/UserCreateUpdate.vue

@@ -116,6 +116,9 @@ export default {
         },
         system_roles: {
           component: Select2,
+          rules: [
+            rules.Required
+          ],
           el: {
             multiple: true,
             ajax: {

yarn.lock

@@ -1086,11 +1086,6 @@
   dependencies:
     katex "^0.16.0"
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@types/glob@^7.1.1":
   version "7.2.0"
   resolved "https://registry.npmmirror.com/@types/glob/-/glob-7.2.0.tgz"
@@ -1446,36 +1441,6 @@
   resolved "https://registry.npmmirror.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz"
   integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
 
-"@vue/reactivity@3.5.13":
-  version "3.5.13"
-  resolved "https://registry.npmmirror.com/@vue/reactivity/-/reactivity-3.5.13.tgz#b41ff2bb865e093899a22219f5b25f97b6fe155f"
-  integrity sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==
-  dependencies:
-    "@vue/shared" "3.5.13"
-
-"@vue/runtime-core@3.5.13":
-  version "3.5.13"
-  resolved "https://registry.npmmirror.com/@vue/runtime-core/-/runtime-core-3.5.13.tgz#1fafa4bf0b97af0ebdd9dbfe98cd630da363a455"
-  integrity sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==
-  dependencies:
-    "@vue/reactivity" "3.5.13"
-    "@vue/shared" "3.5.13"
-
-"@vue/runtime-dom@3.5.13":
-  version "3.5.13"
-  resolved "https://registry.npmmirror.com/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz#610fc795de9246300e8ae8865930d534e1246215"
-  integrity sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==
-  dependencies:
-    "@vue/reactivity" "3.5.13"
-    "@vue/runtime-core" "3.5.13"
-    "@vue/shared" "3.5.13"
-    csstype "^3.1.3"
-
-"@vue/shared@3.5.13":
-  version "3.5.13"
-  resolved "https://registry.npmmirror.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f"
-  integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==
-
 "@vue/test-utils@1.0.0-beta.29":
   version "1.0.0-beta.29"
   resolved "https://registry.npmmirror.com/@vue/test-utils/-/test-utils-1.0.0-beta.29.tgz"
@@ -3374,11 +3339,6 @@ commander@^6.1.0, commander@^6.2.0:
   resolved "https://registry.npmmirror.com/commander/-/commander-6.2.1.tgz"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
-commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
 commander@^8.3.0:
   version "8.3.0"
   resolved "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz"
@@ -3778,17 +3738,6 @@ css-select@^4.1.3:
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
-css-select@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.npmmirror.com/css-select/-/css-select-5.1.0.tgz#b8ebd6554c3637ccc76688804ad3f6a6fdaea8a6"
-  integrity sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.1.0"
-    domhandler "^5.0.2"
-    domutils "^3.0.1"
-    nth-check "^2.0.1"
-
 css-selector-tokenizer@^0.7.0:
   version "0.7.3"
   resolved "https://registry.npmmirror.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz"
@@ -3797,6 +3746,22 @@ css-selector-tokenizer@^0.7.0:
     cssesc "^3.0.0"
     fastparse "^1.1.2"
 
+css-tree@1.0.0-alpha.28:
+  version "1.0.0-alpha.28"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.28.tgz#8e8968190d886c9477bc8d61e96f61af3f7ffa7f"
+  integrity sha512-joNNW1gCp3qFFzj4St6zk+Wh/NBv0vM5YbEreZk0SD4S23S+1xBKb6cLDg2uj4P4k/GUMlIm6cKIDqIG+vdt0w==
+  dependencies:
+    mdn-data "~1.1.0"
+    source-map "^0.5.3"
+
+css-tree@1.0.0-alpha.29:
+  version "1.0.0-alpha.29"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz#3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"
+  integrity sha512-sRNb1XydwkW9IOci6iB2xmy8IGCj6r/fr+JWitvJ2JxQRPzN3T4AGGVWCMlVmVwM1gtgALJRmGIlWv5ppnGGkg==
+  dependencies:
+    mdn-data "~1.1.0"
+    source-map "^0.5.3"
+
 css-tree@1.0.0-alpha.37:
   version "1.0.0-alpha.37"
   resolved "https://registry.npmmirror.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"
@@ -3813,28 +3778,17 @@ css-tree@^1.1.2:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-tree@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmmirror.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
-  integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
-  dependencies:
-    mdn-data "2.0.30"
-    source-map-js "^1.0.1"
-
-css-tree@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.npmmirror.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
-  integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
-  dependencies:
-    mdn-data "2.0.28"
-    source-map-js "^1.0.1"
+css-url-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
+  integrity sha512-hLKuvifwoKvwqpctblTp0BovBuOXzxof8JgkA8zeqxxL+vcynHQjtIqqlFfQI1gEAZAjbqKm9gFTa88fxTAX4g==
 
 css-what@^3.2.1:
   version "3.4.2"
   resolved "https://registry.npmmirror.com/css-what/-/css-what-3.4.2.tgz"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
-css-what@^6.0.1, css-what@^6.1.0:
+css-what@^6.0.1:
   version "6.1.0"
   resolved "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
@@ -3932,6 +3886,13 @@ cssnano@^4.0.0, cssnano@^4.1.10:
     is-resolvable "^1.0.0"
     postcss "^7.0.0"
 
+csso@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
+  integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
+  dependencies:
+    css-tree "1.0.0-alpha.29"
+
 csso@^4.0.2:
   version "4.2.0"
   resolved "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz"
@@ -3939,13 +3900,6 @@ csso@^4.0.2:
   dependencies:
     css-tree "^1.1.2"
 
-csso@^5.0.5:
-  version "5.0.5"
-  resolved "https://registry.npmmirror.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
-  integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
-  dependencies:
-    css-tree "~2.2.0"
-
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.8"
   resolved "https://registry.npmmirror.com/cssom/-/cssom-0.3.8.tgz"
@@ -3958,7 +3912,7 @@ cssstyle@^1.0.0:
   dependencies:
     cssom "0.3.x"
 
-csstype@^3.1.0, csstype@^3.1.3:
+csstype@^3.1.0:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
@@ -4341,15 +4295,6 @@ dom-serializer@^1.0.1:
     domhandler "^4.2.0"
     entities "^2.0.0"
 
-dom-serializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
-  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
-  dependencies:
-    domelementtype "^2.3.0"
-    domhandler "^5.0.2"
-    entities "^4.2.0"
-
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.npmmirror.com/domain-browser/-/domain-browser-1.2.0.tgz"
@@ -4360,7 +4305,7 @@ domelementtype@1, domelementtype@^1.3.1:
   resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-1.3.1.tgz"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
+domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -4386,13 +4331,6 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.2.2, domhandler@^4.3.1:
   dependencies:
     domelementtype "^2.2.0"
 
-domhandler@^5.0.2, domhandler@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.npmmirror.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
-  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
-  dependencies:
-    domelementtype "^2.3.0"
-
 dompurify@^3.1.6:
   version "3.1.6"
   resolved "https://registry.npmmirror.com/dompurify/-/dompurify-3.1.6.tgz"
@@ -4420,15 +4358,6 @@ domutils@^2.5.2, domutils@^2.8.0:
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
-domutils@^3.0.1:
-  version "3.1.0"
-  resolved "https://registry.npmmirror.com/domutils/-/domutils-3.1.0.tgz#c47f551278d3dc4b0b1ab8cbb42d751a6f0d824e"
-  integrity sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==
-  dependencies:
-    dom-serializer "^2.0.0"
-    domelementtype "^2.3.0"
-    domhandler "^5.0.3"
-
 dot-object@^2.1.4:
   version "2.1.4"
   resolved "https://registry.npmmirror.com/dot-object/-/dot-object-2.1.4.tgz"
@@ -4625,11 +4554,6 @@ entities@^3.0.1, entities@~3.0.1:
   resolved "https://registry.npmmirror.com/entities/-/entities-3.0.1.tgz"
   integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
 
-entities@^4.2.0:
-  version "4.5.0"
-  resolved "https://registry.npmmirror.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
-  integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
-
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.npmmirror.com/env-paths/-/env-paths-2.2.1.tgz"
@@ -8585,21 +8509,16 @@ mdn-data@2.0.14:
   resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
-mdn-data@2.0.28:
-  version "2.0.28"
-  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
-  integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
-
-mdn-data@2.0.30:
-  version "2.0.30"
-  resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
-  integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
-
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.4.tgz"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
+mdn-data@~1.1.0:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz#50b5d4ffc4575276573c4eedb8780812a8419f01"
+  integrity sha512-FSYbp3lyKjyj3E7fMl6rYvUdX0FBXaluGqlFoYESWQlyUTq8R+wp0rkFxoYFqZlHCvsUXGjyJmLQSnXToYhOSA==
+
 mdurl@^1.0.1, mdurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
@@ -11903,11 +11822,6 @@ source-list-map@^2.0.0:
   resolved "https://registry.npmmirror.com/source-list-map/-/source-list-map-2.0.1.tgz"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-map-js@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
-  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz"
@@ -12443,18 +12357,25 @@ svg-tags@^1.0.0:
   resolved "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz"
   integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
-svgo@1.2.4:
-  version "3.3.2"
-  resolved "https://registry.npmmirror.com/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8"
-  integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==
+svgo@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316"
+  integrity sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==
   dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^5.1.0"
-    css-tree "^2.3.1"
-    css-what "^6.1.0"
-    csso "^5.0.5"
-    picocolors "^1.0.0"
+    chalk "^2.4.1"
+    coa "^2.0.2"
+    css-select "^2.0.0"
+    css-select-base-adapter "^0.1.1"
+    css-tree "1.0.0-alpha.28"
+    css-url-regex "^1.1.0"
+    csso "^3.5.1"
+    js-yaml "^3.13.1"
+    mkdirp "~0.5.1"
+    object.values "^1.1.0"
+    sax "~1.2.4"
+    stable "^0.1.8"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
 
 svgo@^1.0.0:
   version "1.3.2"
@@ -13408,6 +13329,11 @@ watchpack@^1.5.0:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
 
+watermark-js-plus@^1.5.8:
+  version "1.5.8"
+  resolved "https://registry.yarnpkg.com/watermark-js-plus/-/watermark-js-plus-1.5.8.tgz#1dc5b16bc3efcc7172e53ba5d2e85a05dbbba4b3"
+  integrity sha512-dSQHNSq8hVe6abEAPGKPcjq88XKWu4wiikeELyUlcs48xqQOWG3eWeWNLHcG6Pegujp8HTLXPzKsDvzFLKC+iA==
+
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
   resolved "https://registry.npmmirror.com/wbuf/-/wbuf-1.7.3.tgz"