feat: Update v2.28.17

fix: 修复创建工单后没有关闭操作问题；修复工单详情控制台有报错提示问题

GITSHA

@@ -1 +1 @@
-fd749ef211db3cbaac2c56ea1d95cf0251755580
+4e904add32bb32432d3453465266b2316632bc24

package.json

@@ -63,6 +63,7 @@
     "vue-echarts": "^5.0.0-beta.0",
     "vue-i18n": "^8.15.5",
     "vue-json-editor": "^1.4.3",
+    "vue-markdown": "^2.2.4",
     "vue-moment": "^4.1.0",
     "vue-password-strength-meter": "^1.7.2",
     "vue-router": "3.0.6",
@@ -92,6 +93,7 @@
     "eslint": "^5.15.3",
     "eslint-plugin-vue": "5.2.2",
     "eslint-plugin-vue-i18n": "^0.3.0",
+    "github-markdown-css": "^5.2.0",
     "html-webpack-plugin": "3.2.0",
     "husky": "^4.2.3",
     "less-loader": "^5.0.0",

src/components/MarkDown/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <div class="markdown-body">
+    <VueMarkdown :source="value" />
+  </div>
+</template>
+
+<script>
+import VueMarkdown from 'vue-markdown'
+import 'github-markdown-css/github-markdown-light.css'
+
+export default {
+  components: {
+    VueMarkdown
+  },
+  props: {
+    value: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {}
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.markdown-body * {
+  padding: 10px;
+  background-color: #f3f3f3;
+  color: #1a1a1a;
+  font-size: 13px;
+  //& >>> .table * {
+  //  background-color: #f3f3f3;
+  //}
+}
+</style>

src/components/index.js

@@ -28,3 +28,4 @@ export { default as AssetRelationCard } from './AssetRelationCard'
 export { default as UserConfirmDialog } from './UserConfirmDialog'
 export { default as Announcement } from './Announcement'
 export { default as CronTab } from './CronTab'
+export { default as MarkDown } from './MarkDown'

src/i18n/langs/en.json

@@ -8,6 +8,7 @@
   },
   "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/utils/request.js

@@ -14,7 +14,7 @@ import { DEFAULT_ORG_ID } from '@/utils/org'
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 60 * 1000 // request timeout
+  timeout: 2 * 60 * 1000 // request timeout
 })
 
 function beforeRequestAddToken(config) {

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',
-          'assets_amount', 'applications_amount', 'priority',
+          'priority',
           'created_by', 'date_created', 'date_updated', 'comment', 'org_name', 'actions'
         ],
         columnsShow: {
           min: ['name', 'actions'],
           default: [
-            'name', 'username', 'protocol', 'login_mode', 'assets_amount',
-            'applications_amount', 'comment', 'actions'
+            'name', 'username', 'protocol', 'login_mode',
+            'comment', 'actions'
           ]
         },
         columnsMeta: {
@@ -49,12 +49,6 @@ export default {
           login_mode: {
             width: '120px'
           },
-          assets_amount: {
-            width: '80px'
-          },
-          applications_amount: {
-            width: '80px'
-          },
           actions: {
             formatterArgs: {
               onUpdate: ({ row }) => {

src/views/settings/Auth/Basic.vue

@@ -25,17 +25,6 @@ export default {
           ]
         ]
       ],
-      fieldsMeta: {
-        FORGOT_PASSWORD_URL: {
-          on: {
-            change([value], updateForm) {
-              if (value && !value.startsWith('http')) {
-                updateForm({ FORGOT_PASSWORD_URL: 'http://' + value })
-              }
-            }
-          }
-        }
-      },
       submitMethod() {
         return 'patch'
       }

src/views/settings/Auth/FeiShu.vue

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

src/views/settings/License.vue

@@ -115,6 +115,14 @@ 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,13 +7,13 @@
       <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>
             <br>
             <small class="text-muted">{{ toSafeLocalDateStr(item.date_created) }}</small>
-            <div style="padding-top: 10px;" v-html="item.body" />
+            <MarkDown :value="item.body" />
           </div>
         </div>
       </div>
@@ -68,9 +68,11 @@
 import IBox from '@/components/IBox'
 import { formatTime, getDateTimeStamp } from '@/utils'
 import { toSafeLocalDateStr } from '@/utils/common'
+import MarkDown from '@/components/MarkDown'
+
 export default {
   name: 'Comments',
-  components: { IBox },
+  components: { IBox, MarkDown },
   props: {
     object: {
       type: Object,
@@ -105,7 +107,15 @@ export default {
       return this.object.process_map[this.object.approval_step - 1].assignees.indexOf(this.$store.state.users.profile.id) !== -1
     },
     isSelfTicket() {
-      return this.object.applicant === this.$store.state.users.profile.id
+      let applicant
+      if (this.object.applicant.indexOf('(') > -1) {
+        const applicantName = this.object.applicant.split('(')[1]
+        applicant = applicantName.substring(0, applicantName.length - 1)
+      } else {
+        applicant = this.object.applicant
+      }
+      const userName = this.$store.state.users.profile?.username
+      return applicant === userName
     }
   },
   mounted() {