Merge pull request #76 from meadmin-cn/release

Release
meadmin-cn · Aug 18, 2023 · efa91b4 · efa91b4
2 parents 2ab6ee7 + dbe7196
commit efa91b4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/layout/components/header/components/tagBar/index.vue b/src/layout/components/header/components/tagBar/index.vue
@@ -105,22 +105,22 @@ const setScrollLeft = (left: number, isAdd = false) => {
   }
   $(scrollbarRef.value!.$el).find('.el-scrollbar__wrap').animate({ scrollLeft: left }, 300);
 };
-const max = ref(0);
 const tagsRef = ref([] as HTMLElement[]);
 const currentTag = ref<RouteLocationNormalized>({
   fullPath: '/',
   meta: { title: '' },
 } as RouteLocationNormalized);
 const route = useRoute();
-onMounted(() => {
+const max = ref(0);
+const setMax = () => {
   max.value = listRef.value!.offsetWidth - scrollbarRef.value?.$el.clientWidth;
-  mitter.on(
-    event.RESIZE,
-    () => {
-      max.value = listRef.value!.offsetWidth - scrollbarRef.value?.$el.clientWidth;
-    },
-    true,
-  );
+};
+onMounted(() => {
+  mitter.on(event.RESIZE, setMax, true);
+  watch(tags, setMax, {
+    flush: 'post',
+    immediate: true,
+  });
 });
 const back = () => {
   setScrollLeft(0 - scrollbarRef.value!.$el.clientWidth / 2, true);
@@ -137,7 +137,7 @@ const jump = (index: number) => {
         return;
       }
       if (index === tagsRef.value.length - 1) {
-        setScrollLeft(tagsRef.value[tagsRef.value.length - 1].offsetLeft);
+        max.value > 0 && setScrollLeft(max.value);
         return;
       }
       const parentWidth = scrollbarRef.value!.$el.clientWidth;

diff --git a/src/views/rolePermissions/components/group/group.vue b/src/views/rolePermissions/components/group/group.vue
@@ -7,6 +7,7 @@
       :loading="group.loading.value"
       :row-config="{ isCurrent: true, useKey: true }"
       :tree-config="{ expandAll: true, line: true }"
+      :column-config="{ useKey: true }"
       :custom-column="false"
       :print="false"
       :export-menu="[]"

diff --git a/src/views/rolePermissions/components/menu/menu.vue b/src/views/rolePermissions/components/menu/menu.vue
@@ -9,6 +9,7 @@
       :tree-config="{ expandAll: true, line: true, reserve: true }"
       :checkbox-config="{ labelField: 'id' }"
       :row-config="{ keyField: 'rule', useKey: true }"
+      :column-config="{ useKey: true }"
       align="center"
       border
       me-class="table-menu"