Merge pull request #2182 from jumpserver/dev

v2.28.0-rc4

src/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanDetail/ChangeAuthPlanAsset/index.vue

@@ -74,6 +74,9 @@ export default {
         hasExport: false,
         hasImport: false,
         hasCreate: false,
+        searchConfig: {
+          getUrlQuery: false
+        },
         hasMoreActions: false
       },
       assetRelationConfig: {

src/views/assets/Asset/NodeAssetsUpdateDialog.vue

@@ -88,7 +88,10 @@ export default {
       },
       headerActions: {
         hasLeftActions: false,
-        hasRightActions: false
+        hasRightActions: false,
+        searchConfig: {
+          getUrlQuery: false
+        }
       }
     }
   },

src/views/settings/Other.vue

@@ -47,7 +47,8 @@ export default {
           this.$t('setting.Perm'),
           [
             'PERM_SINGLE_ASSET_TO_UNGROUP_NODE',
-            'TICKET_AUTHORIZE_DEFAULT_TIME'
+            'TICKET_AUTHORIZE_DEFAULT_TIME',
+            'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT'
           ]
         ]
       ],

src/views/tickets/RequestApplicationPerm/CreateUpdate.vue

@@ -25,8 +25,10 @@ export default {
   data() {
     const vm = this
     const now = new Date()
-    const TicketAuthorizeDefaultTime = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
-    const date_expired = getDaysFuture(TicketAuthorizeDefaultTime, new Date()).toISOString()
+    const time = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
+    const unit = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME_UNIT']
+    const dividend = unit === 'hour' ? 24 : 1
+    const date_expired = getDaysFuture(time / dividend, new Date()).toISOString()
     const date_start = now.toISOString()
     let apply_category_type = []
 

src/views/tickets/RequestAssetPerm/CreateUpdate.vue

@@ -17,8 +17,10 @@ export default {
 
   data() {
     const now = new Date()
-    const TicketAuthorizeDefaultTime = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
-    const date_expired = getDaysFuture(TicketAuthorizeDefaultTime, new Date()).toISOString()
+    const time = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME']
+    const unit = store.getters.publicSettings['TICKET_AUTHORIZE_DEFAULT_TIME_UNIT']
+    const dividend = unit === 'hour' ? 24 : 1
+    const date_expired = getDaysFuture(time / dividend, new Date()).toISOString()
     const date_start = now.toISOString()
     return {
       // 工单创建 隐藏提示信息中的跳转连接