Merge pull request #1767 from jumpserver/dev

v2.22.0-rc4

src/components/ListTable/TableAction/ImportDialog.vue

@@ -83,7 +83,7 @@ export default {
       default: () => ''
     },
     canImportCreate: {
-      type: Boolean,
+      type: [Boolean, Function],
       default: false
     },
     canImportUpdate: {

src/components/ListTable/TableAction/RightSide.vue

@@ -78,7 +78,7 @@ export default {
       default: () => []
     },
     canCreate: {
-      type: Boolean,
+      type: [Boolean, Function],
       default: false
     },
     canBulkUpdate: {

src/i18n/langs/zh.json

@@ -916,8 +916,8 @@
     "TerminateTaskSendSuccessMsg": "终断任务已下发，请稍后刷新查看",
     "helpText": {
       "esUrl": "提示：如果有多台主机，请使用逗号 ( , ) 进行分割。（eg: http://www.jumpserver.a.com:3000,http://www.jumpserver.b.com:3000）",
-      "esIndex": "es提供默认index：jumpserver。若选择按日期建索引，此空为索引前缀",
-      "esDocType": "es默认文档类型：command"
+      "esIndex": "es 提供默认 index：jumpserver。如果开启按日期建立索引，那么输入的值会作为索引前缀",
+      "esDocType": "es 默认文档类型：command"
     }
   },
   "setting": {

src/utils/startup.js

@@ -2,9 +2,9 @@
 import store from '@/store'
 import router, { resetRouter } from '@/router'
 import Vue from 'vue'
+import VueCookie from 'vue-cookie'
 import { Message } from 'element-ui'
 import 'nprogress/nprogress.css' // progress bar style
-import { getTokenFromCookie } from '@/utils/auth'
 import orgUtil from '@/utils/org'
 import orgs from '@/api/orgs'
 import { getPropView, isViewHasOrgs } from '@/utils/jms'
@@ -21,14 +21,24 @@ async function checkLogin({ to, from, next }) {
     next()
   }
   // Determine whether the user has logged in
-  const hasToken = getTokenFromCookie()
-  if (!hasToken || hasToken === 'null') {
+  const sessionExpire = VueCookie.get('jms_session_expire')
+  if (!sessionExpire) {
     request.get(process.env['VUE_APP_LOGOUT_PATH']).finally(() => {
       window.location = process.env.VUE_APP_LOGIN_PATH
     })
-    return reject('No token found in cookie')
+    return reject('No session mark found in cookie')
+  } else if (sessionExpire === 'close') {
+    let startTime = new Date().getTime()
+    setInterval(() => {
+      const endTime = new Date().getTime()
+      const delta = (endTime - startTime)
+      startTime = endTime
+      Vue.$log.debug('Set session expire: ', delta)
+      VueCookie.set('jms_session_expire', 'close', { expires: '2m' })
+    }, 10 * 1000)
+  } else if (sessionExpire === 'age') {
+    Vue.$log.debug('Session expire on age')
   }
-
   try {
     return await store.dispatch('users/getProfile')
   } catch (e) {
@@ -43,23 +53,12 @@ async function checkLogin({ to, from, next }) {
   }
 }
 
-function afterGetSetting(setting) {
-  // if (setting['SESSION_EXPIRE_AT_BROWSER_CLOSE']) {
-  //   setInterval(() => {
-  //     const csrfToken = getTokenFromCookie()
-  //     Vue.$log.debug('Refresh csrf token expiration: ', csrfToken)
-  //     if (csrfToken) { setTokenToCookie(csrfToken, '30s') }
-  //   }, 10 * 1000)
-  // }
-}
-
 async function getPublicSetting({ to, from, next }, isOpen) {
   // 获取Public settings
   const publicSettings = store.getters.publicSettings
   if (!publicSettings || !isOpen) {
     await store.dispatch('settings/getPublicSettings', isOpen)
   }
-  afterGetSetting(store.getters.publicSettings)
 }
 
 async function refreshCurrentOrg() {

src/views/assets/Asset/NodeAssetsUpdateDialog.vue

@@ -95,6 +95,7 @@ export default {
   computed: {
     iVisible: {
       set(val) {
+        this.$parent?.hideMenu()
         this.$emit('update:visible', val)
       },
       get() {
@@ -133,6 +134,7 @@ export default {
         $('#tree-refresh').trigger('click')
         this.$message.success(this.$t('common.updateSuccessMsg'))
       }).catch(error => {
+        this.$parent?.hideMenu()
         this.$message.error(this.$t('common.updateErrorMsg' + ' ' + error))
       })
     },

src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue

@@ -61,6 +61,7 @@ export default {
         return validValues
       },
       cleanFormValue(value) {
+        value.meta.INDEX = value.meta?.INDEX?.toLowerCase()
         value.meta.HOSTS = value.meta.HOSTS.split(',').map(item => (item.trim()))
         return value
       }