fix: 批量修复2.6版本测试产生的Bug

src/components/ListTable/TableAction/ImportDialog.vue

@@ -208,7 +208,12 @@ export default {
       this.showImportDialog = false
     },
     beforeUpload(file) {
-      this.isCsv = _.endsWith(file.name, 'csv') || _.endsWith(file.name, 'xlsx')
+      this.isCsv = this.importTypeOption === 'csv' ? _.endsWith(file.name, 'csv') : _.endsWith(file.name, 'xlsx')
+      if (!this.isCsv) {
+        this.$message.error(
+          this.$t('common.NeedSpecifiedFile')
+        )
+      }
       return this.isCsv
     }
   }

src/i18n/langs/cn.json

@@ -185,6 +185,8 @@
     "RequestTickets": "申请工单",
     "Actions": "操作",
     "Activate": "激活",
+    "NeedSpecifiedFile": "需上传指定格式文件",
+    "TestPortErrorMsg":"端口错误,请重新输入",
     "Active": "激活中",
     "actionsTips":"剪切板权限控制目前仅支持 RDP/VNC 协议的连接",
     "Add": "添加",

src/i18n/langs/en.json

@@ -184,6 +184,8 @@
     "Action": "Action",
     "RequestTickets": "Request tickets",
     "Actions": "Actions",
+    "NeedSpecifiedFile": "Required to upload the specified format file",
+    "TestPortErrorMsg":"Port Error, please check",
     "Activate": "Activate",
     "actionsTips":"Clipboard's copy and paste control only support RDP/VNC protocol.",
     "Active": "Active",

src/layout/components/NavHeader/index.vue

@@ -10,7 +10,14 @@
       <div class="header-item">
         <Language />
       </div>
-      <div v-if="publicSettings.TICKETS_ENABLED&&publicSettings.XPACK_LICENSE_IS_VALID" class="header-item">
+      <div
+        v-if="
+          publicSettings.TICKETS_ENABLED
+            && publicSettings.XPACK_LICENSE_IS_VALID
+            && !isOrgAuditor
+        "
+        class="header-item"
+      >
         <Tickets />
       </div>
       <div class="header-item">
@@ -31,6 +38,7 @@ import Help from './Help'
 import Language from './Language'
 import WebTerminal from './WebTerminal'
 import Tickets from './Tickets'
+import rolc from '@/utils/role'
 
 export default {
   components: {
@@ -48,8 +56,11 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar', 'publicSettings'
+      'sidebar', 'publicSettings', 'currentOrgRoles'
-    ])
+    ]),
+    isOrgAuditor() {
+      return rolc.getRolesDisplay(this.currentOrgRoles).includes('OrgAuditor') || rolc.getRolesDisplay(this.currentOrgRoles).includes('Auditor')
+    }
   },
   methods: {
     toggleSideBar() {

src/router/userPage.js

@@ -115,7 +115,6 @@ export default [
   {
     path: `external-luna`,
     component: Layout,
-    hidden: true,
     meta: {
       permissions: [rolec.PERM_USE]
     },

src/views/applications/RemoteApp/RemoteAppList.vue

@@ -1,5 +1,5 @@
 <template>
-  <GenericListPage :table-config="tableConfig" :header-actions="headerActions" :help-message="helpMessage" />
+  <GenericListPage ref="GenericListTable" :table-config="tableConfig" :header-actions="headerActions" :help-message="helpMessage" />
 </template>
 
 <script type="text/jsx">

src/views/assets/Domain/DomainDetail/GatewayList.vue

@@ -109,7 +109,14 @@ export default {
   methods: {
     dialogConfirm() {
       this.buttonLoading = true
-      this.$axios.post(`/api/v1/assets/gateways/${this.cellValue}/test-connective/`, { port: parseInt(this.portInput) }).then(
+
+      const port = parseInt(this.portInput)
+
+      if (isNaN(port)) {
+        this.buttonLoading = false
+        return this.$message.error(this.$t('common.TestPortErrorMsg'))
+      }
+      this.$axios.post(`/api/v1/assets/gateways/${this.cellValue}/test-connective/`, { port: port }).then(
         res => {
           return this.$message.success(this.$t('common.TestSuccessMsg'))
         }