fix: 修复普通用户登录默认 404

perf: 添加注释

src/i18n/langs/en.json

@@ -436,8 +436,8 @@
       "Help": "Help",
       "Logout": "Logout",
       "Profile": "Profile",
-      "TechnicalSupport": "Technical support",
-      "ToolsDownload": "Tools download",
+      "Support": "Support",
+      "Download": "Download",
       "UserPage": "User page",
       "View": "View",
       "EnterpriseEdition": "Enterprise edition"
@@ -696,7 +696,7 @@
     "AssetPermissionUpdate": "Asset permissions update",
     "AssetUpdate": "Asset update",
     "Assets": "Assets",
-    "LogsAudits": "Logs audit",
+    "LogsAudit": "Logs audit",
     "SessionsAudit": "Sessions audit",
     "SessionList": "Session list",
     "BatchCommand": "Batch Command",

src/i18n/langs/ja.json

@@ -448,8 +448,8 @@
       "Help": "ヘルプ",
       "Logout": "ログインを終了する",
       "Profile": "個人情報",
-      "TechnicalSupport": "テクニカルサポート",
-      "ToolsDownload": "ツールのダウンロード",
+      "Support": "サポート",
+      "Download": "ダウンロード",
       "UserPage": "ユーザービュー",
       "View": "ビュー",
       "EnterpriseEdition": "企業版"

src/i18n/langs/zh.json

@@ -448,8 +448,8 @@
       "Help": "帮助",
       "Logout": "退出登录",
       "Profile": "个人信息",
-      "TechnicalSupport": "技术支持",
-      "ToolsDownload": "工具下载",
+      "Support": "支持",
+      "Download": "下载",
       "UserPage": "用户视图",
       "View": "视图",
       "EnterpriseEdition": "企业版"

src/layout/components/Footer/index.vue

@@ -1,11 +1,9 @@
 <template>
-  <div class="footer" :style="style">
-    <div class="pull-right">
+  <div class="footer" :class="device" :style="style">
+    <div class="pull-right version">
       Version <strong> dev </strong> <span v-if="!publicSettings.XPACK_LICENSE_IS_VALID"> GPLv2. </span>
     </div>
-    <div style="padding-left:20px;">
-      {{ publicSettings.XPACK_LICENSE_INFO.corporation }}
-    </div>
+    <div>{{ corporation }}</div>
   </div>
 </template>
 <script>
@@ -27,7 +25,10 @@ export default {
       if (this.device === 'mobile') {
         return ''
       }
-      return this.sidebar.opened ? ('margin-left: 210px;') : ('margin-left: 54px')
+      return this.sidebar.opened ? ('margin-left: 220px;') : ('margin-left: 54px')
+    },
+    corporation() {
+      return this.publicSettings.XPACK_LICENSE_INFO.corporation
     }
   }
 }
@@ -38,9 +39,9 @@ export default {
     height: 35px !important;
 }
 .pull-right {
-    float: right!important;
+    float: right
 }
-.footer{
+.footer {
     position: fixed;
     bottom: 0;
     left: 0;
@@ -55,4 +56,11 @@ export default {
         font-size: 13px;
     }
 }
+.mobile.footer {
+  text-align: center;
+}
+.mobile.footer .pull-right{
+  float: none;
+  display: block;
+}
 </style>

src/layout/components/NavHeader/Help.vue

@@ -5,8 +5,8 @@
     </span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item command="docs">{{ $t('common.nav.Docs') }}</el-dropdown-item>
-      <el-dropdown-item command="support">{{ $t('common.nav.TechnicalSupport') }}</el-dropdown-item>
-      <el-dropdown-item command="toolsDownload">{{ $t('common.nav.ToolsDownload') }}</el-dropdown-item>
+      <el-dropdown-item command="support">{{ $t('common.nav.Support') }}</el-dropdown-item>
+      <el-dropdown-item command="toolsDownload">{{ $t('common.nav.Download') }}</el-dropdown-item>
       <el-dropdown-item v-if="!hasLicence" command="enterprise">{{ $t('common.nav.EnterpriseEdition') }}</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>

src/layout/components/NavLeft/index.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="active-mobile">
         <ViewSwitcher mode="vertical" class="mobile-view-switch" />
-        <Organization class="organization" />
+        <Organization v-if="$hasLicense()" class="organization" />
       </div>
       <div class="nav-title" :class="{'collapsed': isCollapse}">
         {{ isTitle }}

src/utils/common.js

@@ -160,6 +160,8 @@ export function hasUUID(s) {
 }
 
 export function replaceUUID(s, n) {
+  const index = s.search(uuidPattern)
+  if (index > 0) return s.substr(0, index)
   return s.replace(uuidPattern, n)
 }
 

src/utils/jms.js

@@ -80,11 +80,18 @@ export function hasActionPerm(route, action) {
 }
 
 export function getPermedViews() {
+  // 看不懂，别特么瞎改
+  // 当用户访问某个 path 时，如果没有权限，应该 404，但是我们有个组织切换的功能，
+  // 当用户从 A 组织切换到 B 组织时，如果切换到 B 组织没有权限，404 显然不够优雅。
+  // 当用户访问某个 path 时，会从 path 提取 view，判断是否拥有权限，
+  // 如果没有权限，则 自上而下，寻找第一个有权限的 view。
+  // 这里应该拥有所有 view, 否则刷新页面时，有可能也会跳转
   const viewShowMapper = [
     ['console', store.getters.consoleOrgs.length > 0],
-    ['tickets', store.getters.consoleOrgs.length > 0],
     ['audit', store.getters.auditOrgs.length > 0],
-    ['workbench', true]
+    ['workbench', true],
+    ['tickets', hasPermission('tickets.view_ticket')],
+    ['settings', hasPermission('settings.view_setting')]
   ]
   return viewShowMapper.filter(i => i[1]).map(i => i[0])
 }

src/views/settings/Terminal/TerminalList.vue

@@ -109,11 +109,16 @@ export default {
         },
         columns: [
           'name', 'remote_addr', 'session_online',
-          'stat.cpu_load',
-          'stat.disk_used', 'stat.memory_used',
-          'status',
-          'is_active', 'is_alive', 'actions'
+          'stat.cpu_load', 'stat.disk_used', 'stat.memory_used',
+          'status', 'is_active', 'is_alive', 'actions'
         ],
+        columnsShow: {
+          min: ['name'],
+          default: [
+            'name', 'session_online', 'stat.cpu_load', 'stat.disk_used',
+            'stat.memory_used', 'status', 'actions'
+          ]
+        },
         columnsMeta: {
           name: {
             sortable: 'custom',
@@ -175,7 +180,6 @@ export default {
       },
       headerActions: {
         hasCreate: false,
-        hasBulkDelete: false,
         hasUpload: false,
         hasExport: false,
         hasImport: false,

src/views/tickets/TicketFlow/FlowRuleField.vue

@@ -84,7 +84,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
   .text {
     font-size: 14px;
     font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;