feat: Update v3.1.1

v3.1.0 rc4

GITSHA

@@ -0,0 +1 @@
+351e08d542e675885c47121a303ec887912baa58

src/components/FormFields/ProtocolSelector/ProtocolSettingDialog.vue

@@ -54,7 +54,9 @@ export default {
         sftp_home: '/tmp',
         username_selector: '#username',
         password_selector: '#password',
-        submit_selector: '.btn-submit'
+        submit_selector: '.btn-submit',
+        security: 'any',
+        console: false
       },
       loading: true,
       form: {},

src/main.js

@@ -19,7 +19,7 @@ import VueLogger from 'vuejs-logger'
 import loggerOptions from './utils/logger'
 import ECharts from 'vue-echarts'
 import service from '@/utils/request'
-import { Message } from '@/utils/Message'
+import { message } from '@/utils/message'
 import xss from '@/utils/xss'
 
 /**
@@ -60,7 +60,7 @@ Vue.prototype.$axios = service
 window._ = require('lodash')
 // Vue.set(Vue.prototype, '_', _)
 
-Vue.prototype.$message = Message
+Vue.prototype.$message = message
 
 Vue.prototype.$xss = xss
 

src/utils/message.js

@@ -2,7 +2,7 @@
 import { Message as elMessage } from 'element-ui'
 
 let messageDom = null
-const Message = (options) => {
+const message = (options) => {
   // 判断弹窗是否已存在, 若存在则关闭
   if (messageDom) messageDom.close()
   messageDom = elMessage(options)
@@ -10,11 +10,11 @@ const Message = (options) => {
 
 const typeArray = ['success', 'error', 'warning', 'info']
 typeArray.forEach(type => {
-  Message[type] = options => {
+  message[type] = options => {
     if (typeof options === 'string') options = { message: options }
     options.type = type
-    return Message(options)
+    return message(options)
   }
 })
 
-export { Message }
+export { message }

src/utils/request.js

@@ -4,7 +4,7 @@ import { getTokenFromCookie } from '@/utils/auth'
 import { getErrorResponseMsg } from '@/utils/common'
 import { refreshSessionIdAge } from '@/api/users'
 import { MessageBox } from 'element-ui'
-import { Message } from '@/utils/Message'
+import { message } from '@/utils/message'
 import store from '@/store'
 import axiosRetry from 'axios-retry'
 import router from '@/router'
@@ -93,7 +93,7 @@ export function flashErrorMsg({ response, error }) {
   if (!response.config.disableFlashErrorMsg) {
     const responseErrorMsg = getErrorResponseMsg(error)
     const msg = responseErrorMsg || error.message
-    Message({
+    message({
       message: msg,
       type: 'error',
       duration: 5 * 1000

src/utils/startup.js

@@ -3,7 +3,7 @@ import store from '@/store'
 import router, { resetRouter } from '@/router'
 import Vue from 'vue'
 import VueCookie from 'vue-cookie'
-import { Message } from '@/utils/Message'
+import { message } from '@/utils/message'
 import orgUtil from '@/utils/org'
 import orgs from '@/api/orgs'
 import { getPropView, isViewHasOrgs } from '@/utils/jms'
@@ -119,7 +119,7 @@ export async function generatePageRoutes({ to, from, next }) {
   } catch (error) {
     // remove token and go to login page to re-login
     // await store.dispatch('user/resetToken')
-    Message.error(error || 'Has Error')
+    message.error(error || 'Has Error')
     Vue.$log.error('Error occur: ', error)
   }
 }

src/views/accounts/AccountTemplate/AccountTemplateList.vue

@@ -17,7 +17,7 @@ import { ActionsFormatter } from '@/components/TableFormatters'
 import ViewSecret from '@/components/AccountListTable/ViewSecret'
 
 export default {
-  name: 'AccountBackupPlanList',
+  name: 'AccountTemplateList',
   components: {
     GenericListPage,
     ViewSecret

src/views/assets/Asset/AssetCreateUpdate/components/AccountTemplateDialog.vue

@@ -80,7 +80,7 @@ export default {
     }
   },
   data() {
-    const protocols = this.asset.protocols.map(i => i.name).toString()
+    const protocols = this.asset?.protocols?.map(i => i.name).toString() || ''
     return {
       isShowCreate: false,
       accountsSelected: [],

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

@@ -79,6 +79,17 @@ export default {
             },
             password: {
               rules: this.$route.params.id ? [] : [RequiredChange]
+            },
+            platform: {
+              el: {
+                multiple: false,
+                ajax: {
+                  url: `/api/v1/assets/platforms/`,
+                  transformOption: (item) => {
+                    return { label: item.name, value: item.id }
+                  }
+                }
+              }
             }
           }
         },

src/views/assets/const.js

@@ -3,7 +3,7 @@ import ProtocolSelector from '@/components/FormFields/ProtocolSelector'
 import AssetAccounts from '@/views/assets/Asset/AssetCreateUpdate/components/AssetAccounts'
 import rules from '@/components/DataForm/rules'
 import { Select2 } from '@/components/FormFields'
-import { Message } from '@/utils/Message'
+import { message } from '@/utils/message'
 
 export const filterSelectValues = (values) => {
   if (!values) return
@@ -19,7 +19,7 @@ export const filterSelectValues = (values) => {
         const inputValue = { name, value }
         selects.push(inputValue)
       } else {
-        Message.error(i18n.t('assets.LabelInputFormatValidation'))
+        message.error(i18n.t('assets.LabelInputFormatValidation'))
       }
     }
   })

src/views/settings/Ldap/ImportDialog.vue

@@ -18,7 +18,7 @@
       <div slot="footer">
         <span class="org-select">
           <span class="label">{{ $tc('common.ImportOrg') }}：</span>
-          <Select2 ref="select2" v-model="select2.value" v-bind="select2" />
+          <Select2 ref="select2" v-model="select2.value" v-bind="select2" popper-class="select-org-dropdown" />
         </span>
         <el-button type="primary" size="small" :loading="dialogLdapUserImportLoginStatus" @click="importUserClick">{{ $t('common.Import') }}</el-button>
         <el-button
@@ -157,6 +157,12 @@ export default {
 }
 </script>
 
+<style>
+.el-select-dropdown.select-org-dropdown {
+  max-width: 300px!important;
+}
+</style>
+
 <style scoped lang="scss">
   .org-select {
     float: left;