@utogether/udp-core 1.0.1-beta.16 → 1.0.1-beta.17

package/src/layout/components/lay-sidebar/sidebar-logo.vue

@@ -1,92 +1,92 @@
-<!--
- * @Author: wei.li
- * @Date: 2021-11-17 16:02:30
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-17 17:15:15
- * @Description: file content
--->
-<script setup lang="ts">
-import { ref } from 'vue';
-import { storageLocal } from '@utogether/utils';
-import { kSYSCONFIG } from '../../../contant';
-import utogether from '../../../assets/images/utogether.png';
-
-const props = defineProps({
-  collapse: Boolean
-});
-
-const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
-
-const title = sysConfig['title'];
-const logo = ref(sysConfig['logo'] || utogether);
-// console.log(logo);
-</script>
-
-<template>
-  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="ut-collapse-img ut-sidebar-logo" />
-      </router-link>
-      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" to="/">
-        <img :src="logo" class="ut-sidebar-logo h-10" />
-        <span class="sidebar-title">{{ title }}</span>
-      </router-link>
-    </transition>
-  </div>
-</template>
-
-<style lang="scss" scoped>
-.sidebar-logo-container {
-  position: relative;
-  width: 100%;
-  height: 48px;
-  overflow: hidden;
-  text-align: center;
-  background-color: var(--udp-theme-sidebar-logo);
-
-  .sidebar-logo-link {
-    // margin-top: 5px;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-
-    .ut-sidebar-logo {
-      height: 100%;
-    }
-
-    .ut-collapse-img {
-      width: 100%;
-    }
-
-    .sidebar-title {
-      display: block;
-      // width: 140px;
-      // margin-top: 10px;
-      margin-left: 10px;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
-      font-size: 24px;
-      font-weight: 600;
-      color: var(--udp-theme-project-text);
-      text-align: left;
-      white-space: nowrap;
-    }
-  }
-
-  .collapses {
-    .sidebar-logo {
-      margin-right: 0;
-    }
-  }
-
-  svg {
-    width: 50px;
-    height: 50px;
-  }
-}
-</style>
+<!--
+ * @Author: wei.li
+ * @Date: 2021-11-17 16:02:30
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-17 17:15:15
+ * @Description: file content
+-->
+<script setup lang="ts">
+import { ref } from 'vue';
+import { storageLocal } from '@utogether/utils';
+import { kSYSCONFIG } from '../../../contant';
+import utogether from '../../../assets/images/utogether.png';
+
+const props = defineProps({
+  collapse: Boolean
+});
+
+const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
+
+const title = sysConfig['title'];
+const logo = ref(sysConfig['logo'] || utogether);
+// console.log(logo);
+</script>
+
+<template>
+  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
+    <transition name="sidebarLogoFade">
+      <router-link v-if="props.collapse" key="props.collapse" :title="title" class="sidebar-logo-link" to="/">
+        <img :src="logo" class="ut-collapse-img ut-sidebar-logo" />
+      </router-link>
+      <router-link v-else key="expand" :title="title" class="sidebar-logo-link" to="/">
+        <img :src="logo" class="ut-sidebar-logo h-10" />
+        <span class="sidebar-title">{{ title }}</span>
+      </router-link>
+    </transition>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.sidebar-logo-container {
+  position: relative;
+  width: 100%;
+  height: 48px;
+  overflow: hidden;
+  text-align: center;
+  background-color: var(--udp-theme-sidebar-logo);
+
+  .sidebar-logo-link {
+    // margin-top: 5px;
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    .ut-sidebar-logo {
+      height: 100%;
+    }
+
+    .ut-collapse-img {
+      width: 100%;
+    }
+
+    .sidebar-title {
+      display: block;
+      // width: 140px;
+      // margin-top: 10px;
+      margin-left: 10px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      font-family: Avenir, 'Helvetica Neue', Arial, Helvetica, sans-serif;
+      font-size: 24px;
+      font-weight: 600;
+      color: var(--udp-theme-project-text);
+      text-align: left;
+      white-space: nowrap;
+    }
+  }
+
+  .collapses {
+    .sidebar-logo {
+      margin-right: 0;
+    }
+  }
+
+  svg {
+    width: 50px;
+    height: 50px;
+  }
+}
+</style>

package/src/layout/components/lay-tag/index.vue

@@ -53,10 +53,7 @@ const contextmenuRef = ref();
 const isShowArrow = ref(false);
 const { isFullscreen, toggle } = useFullscreen();
 
-const fixedTags = [
-  ...routerArrays,
-  ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)
-];
+const fixedTags = [...routerArrays, ...usePermissionStoreHook().flatteningRoutes.filter(v => v?.meta?.fixedTag)];
 const dynamicTagView = async () => {
   await nextTick();
   const index = multiTags.value.findIndex(item => {
@@ -93,10 +90,7 @@ const moveToView = async (index: number): Promise<void> => {
     tabItemElOffsetLeft + tabItemOffsetWidth < -translateX.value + scrollbarDomWidth
   ) {
     // 标签在可视区域
-    translateX.value = Math.min(
-      0,
-      scrollbarDomWidth - tabItemOffsetWidth - tabItemElOffsetLeft - tabNavPadding
-    );
+    translateX.value = Math.min(0, scrollbarDomWidth - tabItemOffsetWidth - tabItemElOffsetLeft - tabNavPadding);
   } else {
     // 标签在可视区域右侧
     translateX.value = -(tabItemElOffsetLeft - (scrollbarDomWidth - tabNavPadding - tabItemOffsetWidth));
@@ -171,7 +165,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
 
   const spliceRoute = (startIndex?: number, length?: number, other?: boolean): void => {
     if (other) {
-      useMultiTagsStoreHook().handleTags('equal', [fixedTags, obj]);
+      useMultiTagsStoreHook().handleTags('equal', [fixedTags, obj].flat());
     } else {
       useMultiTagsStoreHook().handleTags('splice', '', {
         startIndex,
@@ -216,6 +210,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
 }
 
 function deleteMenu(item, tag?: string) {
+  debugger;
   deleteDynamicTag(item, item.path, tag);
   handleAliveRoute(route as ToRouteType);
 }
@@ -294,7 +289,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query);
+    showMenuModel(route.fullPath, route.query, route.params);
   });
 }
 
@@ -326,11 +321,13 @@ function disabledMenus(value: boolean, fixedTag = false) {
 }
 
 /** 检查当前右键的菜单两边是否存在别的菜单，如果左侧的菜单是顶级菜单，则不显示关闭左侧标签页，如果右侧没有菜单，则不显示关闭右侧标签页 */
-function showMenuModel(currentPath: string, query: object = {}, refresh = false) {
+function showMenuModel(currentPath: string, query: object = {}, params: object = {}, refresh = false) {
   const allRoute = multiTags.value;
   const routeLength = multiTags.value.length;
   let currentIndex = -1;
-  if (isEmpty(query)) {
+  if (!isEmpty(params)) {
+    currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
+  } else if (isEmpty(query)) {
     currentIndex = allRoute.findIndex(v => v.path === currentPath);
   } else {
     currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
@@ -400,14 +397,15 @@ function openMenu(tag, e) {
   } else if (route.path !== tag.path && route.name !== tag.name) {
     // 右键菜单不匹配当前路由，隐藏刷新
     tagsViews[0].show = false;
-    showMenuModel(tag.path, tag.query);
+    showMenuModel(tag.path, tag.query, tag.params);
   } else if (multiTags.value.length === 2 && route.path !== tag.path) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
+    showMenuModel(tag.path, tag.query, tag.params);
   } else if (route.path === tag.path) {
     // 右键当前激活的菜单
-    showMenuModel(tag.path, tag.query, true);
+    showMenuModel(tag.path, tag.query, tag.params, true);
   }
 
   currentSelect.value = tag;
@@ -512,11 +510,7 @@ onBeforeUnmount(() => {
     <span v-show="isShowArrow" class="arrow-left">
       <IconifyIconOffline icon="ri:arrow-left-s-line" @click="handleScroll(200)" />
     </span>
-    <div
-      ref="scrollbarDom"
-      class="scroll-container"
-      :class="showModel === 'chrome' && 'chrome-scroll-container'"
-    >
+    <div ref="scrollbarDom" class="scroll-container" :class="showModel === 'chrome' && 'chrome-scroll-container'">
       <div ref="tabDom" class="select-none tab" :style="getTabStyle">
         <div
           v-for="(item, index) in multiTags"
@@ -535,37 +529,25 @@ onBeforeUnmount(() => {
         >
           <template v-if="showModel !== 'chrome'">
             <span class="tag-title dark:text-text_color_primary! dark:hover:text-primary!">
-              {{ transformI18n(item.meta.title) }}
+              {{ transformI18n(item?.meta?.title) }}
             </span>
             <span
-              v-if="
-                isFixedTag(item)
-                  ? false
-                  : iconIsActive(item, index) || (index === activeIndex && index !== 0)
-              "
+              v-if="isFixedTag(item) ? false : iconIsActive(item, index) || (index === activeIndex && index !== 0)"
               class="el-icon-close"
               @click.stop="deleteMenu(item)"
             >
               <IconifyIconOffline icon="ri:close-fill" />
             </span>
-            <span
-              v-if="showModel !== 'card'"
-              :ref="'schedule' + index"
-              :class="[scheduleIsActive(item)]"
-            />
+            <span v-if="showModel !== 'card'" :ref="'schedule' + index" :class="[scheduleIsActive(item)]" />
           </template>
           <div v-else class="chrome-tab">
             <div class="chrome-tab__bg">
               <TagChrome />
             </div>
             <span class="tag-title">
-              {{ transformI18n(item.meta.title) }}
+              {{ transformI18n(item?.meta?.title) }}
             </span>
-            <span
-              v-if="isFixedTag(item) ? false : index !== 0"
-              class="chrome-close-btn"
-              @click.stop="deleteMenu(item)"
-            >
+            <span v-if="isFixedTag(item) ? false : index !== 0" class="chrome-close-btn" @click.stop="deleteMenu(item)">
               <IconifyIconOffline icon="ri:close-fill" />
             </span>
             <span class="chrome-tab-divider" />
@@ -578,18 +560,8 @@ onBeforeUnmount(() => {
     </span>
     <!-- 右键菜单按钮 -->
     <transition name="el-zoom-in-top">
-      <ul
-        v-show="visible"
-        ref="contextmenuRef"
-        :key="Math.random()"
-        :style="getContextMenuStyle"
-        class="contextmenu"
-      >
-        <div
-          v-for="(item, key) in tagsViews.slice(0, 6)"
-          :key="key"
-          style="display: flex; align-items: center"
-        >
+      <ul v-show="visible" ref="contextmenuRef" :key="Math.random()" :style="getContextMenuStyle" class="contextmenu">
+        <div v-for="(item, key) in tagsViews.slice(0, 6)" :key="key" style="display: flex; align-items: center">
           <li v-if="item.show" @click="selectTag(key, item)">
             <IconifyIconOffline :icon="item.icon" />
             {{ $t(item.text) }}