Merge pull request #4140 from jumpserver/pr@dev@fix_tag_dialog_close

fixed: Fixed an issue where Tag Dialog could not be closed when jumping

src/components/Cards/RelationCard/index.vue

@@ -279,6 +279,7 @@ export default {
         return
       }
       this.select2.disabledValues = this.hasObjectsId
+
       if (this.getHasObjects) {
         this.getHasObjects(this.hasObjectsId).then((data) => {
           this.iHasObjects = data

src/components/Table/TableFormatters/LabelsFormatter.vue

@@ -194,6 +194,7 @@ export default {
       })
     },
     goToLabelList() {
+      this.showDialog = false
       this.$router.push({ name: 'LabelList' })
     }
   }

src/router/console/acls.js

@@ -102,7 +102,10 @@ export default [
             name: 'CommandFilterAclDetail',
             component: () => import('@/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclDetail/index'),
             hidden: true,
-            meta: { title: i18n.t('CommandFilterAclDetail'), activeMenu: '' }
+            meta: {
+              title: i18n.t('CommandFilterAclDetail'),
+              activeMenu: ''
+            }
           },
           {
             path: ':id/update',

src/views/acl/CommandAcl/CommandFilterAcl/CommandFilterAclList.vue

@@ -2,7 +2,6 @@
   <div>
     <ListTable ref="listTable" :header-actions="headerActions" :table-config="tableConfig" />
   </div>
-
 </template>
 
 <script>

src/views/acl/UserLoginACL/UserLoginACLCreateUpdate.vue

@@ -90,14 +90,6 @@ export default {
         return value
       }
     }
-  },
-  mounted() {
-  },
-  methods: {
   }
 }
 </script>
-
-<style>
-
-</style>

src/views/tickets/TicketFlow/FlowRuleField.vue

@@ -12,7 +12,6 @@
           <el-radio label="super_org_admin">{{ vm.$t('SuperOrgAdmin') }}</el-radio>
           <el-radio label="custom_user">{{ vm.$t('CustomUser') }}</el-radio>
         </el-radio-group>
-        <br>
         <Select2 v-show="item.strategy.value === 'custom_user'" v-model="item.assignees" v-bind="select2Option" @change="onChange()" />
       </el-card>
     </div>
@@ -86,7 +85,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
   .text {
     font-size: 14px;
     font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
@@ -98,5 +97,20 @@ export default {
 
   .box-card {
     width: 600px;
+    box-shadow: unset !important;
+
+    ::v-deep .el-card__body {
+      padding: 10px 30px !important;
+
+      .el-radio-group {
+        display: flex;
+        flex-direction: column;
+        margin-bottom: 10px;
+
+        .el-radio {
+          padding: 5px 0;
+        }
+      }
+    }
   }
 </style>