Merge pull request #1112 from jumpserver/dev

v2.15.0-rc2

src/components/Announcement/index.vue

@@ -1,12 +1,13 @@
 <template>
   <el-alert
     v-if="enabled && !isViewed()"
+    class="announcement"
     type="success"
     :center="false"
     :title="title"
     @close="onClose"
   >
-    <span> {{ announcement.content }}</span>
+    <span class="announcement-main"> {{ announcement.content }}</span>
     <span v-if="announcement.link">
       <el-link :href="announcement.link" target="_blank" class="link-more">
         {{ $t('common.ViewMore') }}
@@ -54,6 +55,12 @@ export default {
 </script>
 
 <style scoped>
+.announcement >>> .el-alert__content {
+  width: 100%;
+}
+.announcement-main {
+  word-wrap:break-word;
+}
 .link-more {
   font-size: 10px;
   margin-left: 10px;

src/components/FormFields/Select2.vue

@@ -178,8 +178,8 @@ export default {
     if (!this.initialized) {
       await this.initialSelect()
       setTimeout(() => {
-        this.initialized = true
         this.iValue = this.value
+        this.initialized = true
       })
     }
     this.$nextTick(() => {

src/views/acl/UserLoginACL/UserLoginACLList.vue

@@ -14,10 +14,10 @@ export default {
     return {
       tableConfig: {
         url: `/api/v1/acls/login-acls/?user=${this.$route.params.id}`,
-        columns: ['name', 'ip_group', 'reviewers', 'priority', 'user_display', 'is_active', 'comment', 'actions'],
+        columns: ['name', 'reviewers', 'priority', 'user_display', 'action', 'is_active', 'comment', 'actions'],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'priority', 'is_active', 'user_display', 'comment', 'actions']
+          default: ['name', 'priority', 'is_active', 'user_display', 'action', 'comment', 'actions']
         },
         columnsMeta: {
           name: {

src/views/assets/SystemUser/SystemUserList/CommonUserList.vue

@@ -21,12 +21,14 @@ export default {
         url: '/api/v1/assets/system-users/?type=common',
         columns: [
           'name', 'username', 'username_same_with_user', 'protocol', 'login_mode',
-          'assets_amount', 'priority',
+          'assets_amount', 'applications_amount', 'priority',
           'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
-          default: ['name', 'username', 'protocol', 'login_mode', 'assets_amount', 'comment', 'actions']
+          default: [
+            'name', 'username', 'protocol', 'login_mode', 'assets_amount', 'applications_amount', 'comment', 'actions'
+          ]
         },
         columnsMeta: {
           username: {
@@ -47,6 +49,9 @@ export default {
           assets_amount: {
             width: '80px'
           },
+          applications_amount: {
+            width: '80px'
+          },
           actions: {
             formatterArgs: {
               onUpdate: ({ row }) => {

src/views/tickets/RequestApplicationPerm/Detail/TicketDetail.vue

@@ -78,11 +78,11 @@ export default {
         },
         {
           key: this.$t('applications.appName'),
-          value: this.object.meta.apply_applications_display
+          value: this.object.meta.apply_applications_display.join(', ')
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display
+          value: this.object.meta.apply_system_users_display.join(', ')
         },
         {
           key: this.$t('common.dateStart'),
@@ -111,11 +111,11 @@ export default {
         },
         {
           key: this.$t('applications.appName'),
-          value: this.object.meta['apply_applications_display']
+          value: this.object.meta.apply_applications_display.join(', ')
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta['apply_system_users_display']
+          value: this.object.meta.apply_system_users_display.join(', ')
         },
         {
           key: this.$t('common.dateStart'),

src/views/tickets/RequestAssetPerm/Detail/TicketDetail.vue

@@ -71,11 +71,11 @@ export default {
       return [
         {
           key: this.$t('tickets.Asset'),
-          value: this.object.meta.apply_assets_display
+          value: this.object.meta.apply_assets_display.join(', ')
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta.apply_system_users_display
+          value: this.object.meta.apply_system_users_display.join(', ')
         },
         {
           key: this.$t('assets.Action'),
@@ -108,11 +108,11 @@ export default {
         },
         {
           key: this.$t('assets.Asset'),
-          value: this.object.meta['apply_assets_display']
+          value: this.object.meta.apply_assets_display.join(', ')
         },
         {
           key: this.$t('tickets.SystemUser'),
-          value: this.object.meta['apply_system_users_display']
+          value: this.object.meta.apply_system_users_display.join(', ')
         },
         {
           key: this.$t('assets.Action'),

vue.config.js

@@ -39,6 +39,7 @@ module.exports = {
     port: port,
     host: '0.0.0.0',
     open: false,
+    disableHostCheck: true,
     overlay: {
       warnings: false,
       errors: true
@@ -84,9 +85,9 @@ module.exports = {
       alias: {
         '@': resolve('src'),
         elementCss: resolve('node_modules/element-ui/lib/theme-chalk/index.css'),
-        elementLocale: resolve('node_modules/element-ui/lib/locale/lang/en.js'),
+        elementLocale: resolve('node_modules/element-ui/lib/locale/lang/en.js')
       },
-      extensions: ['.vue', '.js', '.json'], 
+      extensions: ['.vue', '.js', '.json']
     },
     plugins: [
       new CompressionWebpackPlugin({