feat: Update v2.28.3

GITSHA

@@ -1 +1 @@
-3c2c2ca30234f1403b0590c3bd5d63c86c1bd9b4
+5667c39bcb45300676b63d25754fd022543dca06

src/i18n/langs/en.json

@@ -8,7 +8,6 @@
   },
   "acl": {
     "name": "Name",
-    "ip_group_help_text": "The format is a comma-separated string, * means match all. Example: 192.168.10.1, 192.168.1.0/24, 10.1.1.1-10.1.1.20, 2001:db8:2de::e13, 2001:db8:1a:1110::/64",
     "username": "Username",
     "ip_group": "IP group",
     "action": "Action",

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

@@ -23,14 +23,14 @@ export default {
         url: '/api/v1/assets/system-users/?type=common',
         columns: [
           'name', 'username', 'username_same_with_user', 'protocol', 'login_mode',
-          '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',
-            'comment', 'actions'
+            'name', 'username', 'protocol', 'login_mode', 'assets_amount',
+            'applications_amount', 'comment', 'actions'
           ]
         },
         columnsMeta: {
@@ -49,6 +49,12 @@ export default {
           login_mode: {
             width: '120px'
           },
+          assets_amount: {
+            width: '80px'
+          },
+          applications_amount: {
+            width: '80px'
+          },
           actions: {
             formatterArgs: {
               onUpdate: ({ row }) => {

src/views/settings/Auth/FeiShu.vue

@@ -44,7 +44,7 @@ export default {
           [
             this.$t('common.BasicInfo'),
             [
-              'AUTH_FEISHU', 'FEISHU_APP_ID', 'FEISHU_APP_SECRET', 'FEISHU_VERSION'
+              'AUTH_FEISHU', 'FEISHU_APP_ID', 'FEISHU_APP_SECRET'
             ]
           ]
         ],

src/views/settings/Auth/OIDC.vue

@@ -32,7 +32,6 @@ export default {
             'AUTH_OPENID_PROVIDER_TOKEN_ENDPOINT', 'AUTH_OPENID_PROVIDER_JWKS_ENDPOINT',
             'AUTH_OPENID_PROVIDER_USERINFO_ENDPOINT', 'AUTH_OPENID_PROVIDER_END_SESSION_ENDPOINT',
             'AUTH_OPENID_PROVIDER_SIGNATURE_ALG', 'AUTH_OPENID_PROVIDER_SIGNATURE_KEY',
-            'AUTH_OPENID_PKCE', 'AUTH_OPENID_CODE_CHALLENGE_METHOD',
             'AUTH_OPENID_SCOPES', 'AUTH_OPENID_ID_TOKEN_MAX_AGE', 'AUTH_OPENID_ID_TOKEN_INCLUDE_CLAIMS',
             'AUTH_OPENID_USE_STATE', 'AUTH_OPENID_USE_NONCE', 'AUTH_OPENID_ALWAYS_UPDATE_USER',
             'AUTH_OPENID_IGNORE_SSL_VERIFICATION', 'AUTH_OPENID_SHARE_SESSION', 'AUTH_OPENID_USER_ATTR_MAP'
@@ -88,12 +87,6 @@ export default {
           AUTH_OPENID_PROVIDER_SIGNATURE_KEY: {
             hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
           },
-          AUTH_OPENID_PKCE: {
-            hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
-          },
-          AUTH_OPENID_CODE_CHALLENGE_METHOD: {
-            hidden: (form) => form['AUTH_OPENID_KEYCLOAK'] || !form['AUTH_OPENID_PKCE']
-          },
           'AUTH_OPENID_SCOPES': {
             hidden: (form) => form['AUTH_OPENID_KEYCLOAK']
           },

src/views/settings/License.vue

@@ -115,14 +115,6 @@ export default {
         {
           key: this.$t('setting.Edition'),
           value: this.licenseData.edition
-        },
-        {
-          key: this.$t('assets.SerialNumber'),
-          value: this.licenseData?.serial_no || ''
-        },
-        {
-          key: this.$t('common.Comment'),
-          value: this.licenseData?.remark || ''
         }
       ]
     }

src/views/tickets/components/Comments.vue

@@ -7,7 +7,7 @@
       <div v-for="item in comments" :key="item.id" class="feed-activity-list">
         <div class="feed-element">
           <a href="#" class="pull-left">
-            <el-avatar :src="imageUrl" :size="30" class="header-avatar" />
+            <el-avatar :src="imageUrl" size="30" class="header-avatar" />
           </a>
           <div class="media-body ">
             <strong>{{ item.user_display }}</strong> <small class="text-muted">{{ formatTime(item.date_created) }}</small>
@@ -105,9 +105,7 @@ export default {
       return this.object.process_map[this.object.approval_step - 1].assignees.indexOf(this.$store.state.users.profile.id) !== -1
     },
     isSelfTicket() {
-      const applicant = this.object.applicant.indexOf('(') > -1 ? this.object.applicant.split('(')[0] : this.object.applicant
-      const userName = this.$store.state.users.profile?.username
-      return applicant === userName
+      return this.object.applicant === this.$store.state.users.profile.id
     }
   },
   mounted() {