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

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) }}

package/src/layout/hooks/useNav.ts

@@ -1,173 +1,173 @@
-/*
- * @Author: wei.li
- * @Date: 2023-04-18 15:44:40
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-04-16 15:49:31
- * @Description: file content
- */
-import { computed, type CSSProperties } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useRouter } from 'vue-router';
-import { cookies, useGlobal, storageLocal } from '@utogether/utils';
-import { router, remainingPaths, resetRouter } from '../../router';
-import { emitter } from '../../utils/mitt';
-import { getEnv } from '../../config';
-import { kTOKEN, kLOGINER, kCKTOKEN, kSYSCONFIG } from '../../contant';
-import { routerArrays } from '../types';
-// import { transformI18n } from '@/plugins/i18n';
-import { useAppStoreHook } from '../../store/modules/app';
-import { usePermissionStoreHook } from '../../store/modules/permission';
-import { useEpThemeStoreHook } from '../../store/modules/epTheme';
-import { useSystemStoreHook } from '../../store/modules/system';
-import { useMultiTagsStoreHook } from '../../store/modules/multiTags';
-
-const errorInfo = '当前路由配置不正确，请检查配置';
-
-export function useNav() {
-  const appHook = useAppStoreHook();
-  const routers = useRouter().options.routes;
-  const { wholeMenus } = storeToRefs(usePermissionStoreHook());
-
-  const getDivStyle = computed((): CSSProperties => {
-    return {
-      width: '100%',
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'space-between',
-      overflow: 'hidden'
-    };
-  });
-
-  /** 设置国际化选中后的样式 */
-  const getDropdownItemStyle = computed(() => {
-    return (locale, t) => {
-      return {
-        background: locale === t ? useEpThemeStoreHook().epThemeColor : '',
-        color: locale === t ? '#f4f4f5' : '#000'
-      };
-    };
-  });
-
-  const getDropdownItemClass = computed(() => {
-    return (locale, t) => {
-      return locale === t ? '' : 'dark:hover:text-primary!';
-    };
-  });
-
-  /** 用户名 */
-  const userInfo = computed<IRecord>(() => {
-    return useSystemStoreHook().getUserInfo || {};
-  });
-  const avatarsStyle = computed(() => {
-    return userInfo.value ? { marginRight: '10px' } : '';
-  });
-
-  const isCollapse = computed(() => {
-    return !appHook.getSidebarStatus;
-  });
-
-  const device = computed(() => {
-    return appHook.getDevice;
-  });
-
-  const { $storage } = useGlobal();
-  const layout = computed(() => {
-    return $storage?.layout?.layout;
-  });
-
-  const title = computed(() => {
-    const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
-    return sysConfig?.title || 'U-DP';
-  });
-
-  /** 动态title */
-  function setDocumentTitle() {
-    document.title = getEnv().MODE !== 'staging' ? title.value : `${title.value}•测试`;
-  }
-
-  /** 退出登录 */
-  function logout() {
-    useMultiTagsStoreHook().handleTags('equal', [...routerArrays]);
-    cookies.remove(kCKTOKEN);
-    cookies.remove(kTOKEN);
-    cookies.remove(kLOGINER);
-    usePermissionStoreHook().setWholeMenus([]);
-    // 关闭全部标签页, 防止缓存了tags，又用另一个账号登录
-    useMultiTagsStoreHook().handleTags('splice', '', {
-      startIndex: 1,
-      length: useMultiTagsStoreHook()?.multiTags?.length
-    });
-    usePermissionStoreHook().clearAllCachePage();
-    resetRouter();
-    router.push('/login');
-  }
-
-  function backHome() {
-    router.push('/welcome');
-  }
-
-  function onPanel() {
-    emitter.emit('openPanel');
-  }
-
-  function toggleSideBar() {
-    appHook.toggleSideBar();
-  }
-
-  function handleResize(menuRef) {
-    menuRef?.handleResize();
-  }
-
-  function resolvePath(route) {
-    if (!route.children) return console.error(errorInfo);
-    const httpReg = /^http(s?):\/\//;
-    const routeChildPath = route.children[0]?.path;
-    if (httpReg.test(routeChildPath)) {
-      return route.path + '/' + routeChildPath;
-    } else {
-      return routeChildPath;
-    }
-  }
-  function menuSelect(indexPath: string) {
-    if (wholeMenus.value.length === 0 || isRemaining(indexPath)) return;
-    emitter.emit('changLayoutRoute', indexPath);
-  }
-
-  /** 判断路径是否参与菜单 */
-  function isRemaining(path: string) {
-    return remainingPaths.includes(path);
-  }
-
-  function passwordItems() {
-    const itemRender = { name: '$input', props: { type: 'password' } };
-    return [
-      { field: 'oldUserPwd', title: 'message.udp.oldPwd', required: true, itemRender },
-      { field: 'userPwd', title: 'message.udp.newPwd', required: true, itemRender },
-      { field: 'confirmPwd', title: 'message.udp.confirmPwd', required: true, itemRender }
-    ];
-  }
-
-  return {
-    title,
-    device,
-    layout,
-    logout,
-    routers,
-    $storage,
-    backHome,
-    onPanel,
-    getDivStyle,
-    setDocumentTitle,
-    toggleSideBar,
-    menuSelect,
-    handleResize,
-    resolvePath,
-    isCollapse,
-    appHook,
-    userInfo,
-    avatarsStyle,
-    getDropdownItemStyle,
-    getDropdownItemClass,
-    passwordItems
-  };
-}
+/*
+ * @Author: wei.li
+ * @Date: 2023-04-18 15:44:40
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-04-16 15:49:31
+ * @Description: file content
+ */
+import { computed, type CSSProperties } from 'vue';
+import { storeToRefs } from 'pinia';
+import { useRouter } from 'vue-router';
+import { cookies, useGlobal, storageLocal } from '@utogether/utils';
+import { router, remainingPaths, resetRouter } from '../../router';
+import { emitter } from '../../utils/mitt';
+import { getEnv } from '../../config';
+import { kTOKEN, kLOGINER, kCKTOKEN, kSYSCONFIG } from '../../contant';
+import { routerArrays } from '../types';
+// import { transformI18n } from '@/plugins/i18n';
+import { useAppStoreHook } from '../../store/modules/app';
+import { usePermissionStoreHook } from '../../store/modules/permission';
+import { useEpThemeStoreHook } from '../../store/modules/epTheme';
+import { useSystemStoreHook } from '../../store/modules/system';
+import { useMultiTagsStoreHook } from '../../store/modules/multiTags';
+
+const errorInfo = '当前路由配置不正确，请检查配置';
+
+export function useNav() {
+  const appHook = useAppStoreHook();
+  const routers = useRouter().options.routes;
+  const { wholeMenus } = storeToRefs(usePermissionStoreHook());
+
+  const getDivStyle = computed((): CSSProperties => {
+    return {
+      width: '100%',
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'space-between',
+      overflow: 'hidden'
+    };
+  });
+
+  /** 设置国际化选中后的样式 */
+  const getDropdownItemStyle = computed(() => {
+    return (locale, t) => {
+      return {
+        background: locale === t ? useEpThemeStoreHook().epThemeColor : '',
+        color: locale === t ? '#f4f4f5' : '#000'
+      };
+    };
+  });
+
+  const getDropdownItemClass = computed(() => {
+    return (locale, t) => {
+      return locale === t ? '' : 'dark:hover:text-primary!';
+    };
+  });
+
+  /** 用户名 */
+  const userInfo = computed<IRecord>(() => {
+    return useSystemStoreHook().getUserInfo || {};
+  });
+  const avatarsStyle = computed(() => {
+    return userInfo.value ? { marginRight: '10px' } : '';
+  });
+
+  const isCollapse = computed(() => {
+    return !appHook.getSidebarStatus;
+  });
+
+  const device = computed(() => {
+    return appHook.getDevice;
+  });
+
+  const { $storage } = useGlobal();
+  const layout = computed(() => {
+    return $storage?.layout?.layout;
+  });
+
+  const title = computed(() => {
+    const sysConfig = storageLocal.getItem(kSYSCONFIG) || {};
+    return sysConfig?.title || 'U-DP';
+  });
+
+  /** 动态title */
+  function setDocumentTitle() {
+    document.title = getEnv().MODE !== 'staging' ? title.value : `${title.value}•测试`;
+  }
+
+  /** 退出登录 */
+  function logout() {
+    useMultiTagsStoreHook().handleTags('equal', [...routerArrays]);
+    cookies.remove(kCKTOKEN);
+    cookies.remove(kTOKEN);
+    cookies.remove(kLOGINER);
+    usePermissionStoreHook().setWholeMenus([]);
+    // 关闭全部标签页, 防止缓存了tags，又用另一个账号登录
+    useMultiTagsStoreHook().handleTags('splice', '', {
+      startIndex: 1,
+      length: useMultiTagsStoreHook()?.multiTags?.length
+    });
+    usePermissionStoreHook().clearAllCachePage();
+    resetRouter();
+    router.push('/login');
+  }
+
+  function backHome() {
+    router.push('/welcome');
+  }
+
+  function onPanel() {
+    emitter.emit('openPanel');
+  }
+
+  function toggleSideBar() {
+    appHook.toggleSideBar();
+  }
+
+  function handleResize(menuRef) {
+    menuRef?.handleResize();
+  }
+
+  function resolvePath(route) {
+    if (!route.children) return console.error(errorInfo);
+    const httpReg = /^http(s?):\/\//;
+    const routeChildPath = route.children[0]?.path;
+    if (httpReg.test(routeChildPath)) {
+      return route.path + '/' + routeChildPath;
+    } else {
+      return routeChildPath;
+    }
+  }
+  function menuSelect(indexPath: string) {
+    if (wholeMenus.value.length === 0 || isRemaining(indexPath)) return;
+    emitter.emit('changLayoutRoute', indexPath);
+  }
+
+  /** 判断路径是否参与菜单 */
+  function isRemaining(path: string) {
+    return remainingPaths.includes(path);
+  }
+
+  function passwordItems() {
+    const itemRender = { name: '$input', props: { type: 'password' } };
+    return [
+      { field: 'oldUserPwd', title: 'message.udp.oldPwd', required: true, itemRender },
+      { field: 'userPwd', title: 'message.udp.newPwd', required: true, itemRender },
+      { field: 'confirmPwd', title: 'message.udp.confirmPwd', required: true, itemRender }
+    ];
+  }
+
+  return {
+    title,
+    device,
+    layout,
+    logout,
+    routers,
+    $storage,
+    backHome,
+    onPanel,
+    getDivStyle,
+    setDocumentTitle,
+    toggleSideBar,
+    menuSelect,
+    handleResize,
+    resolvePath,
+    isCollapse,
+    appHook,
+    userInfo,
+    avatarsStyle,
+    getDropdownItemStyle,
+    getDropdownItemClass,
+    passwordItems
+  };
+}

package/src/layout/hooks/useTag.ts

@@ -91,14 +91,16 @@ export function useTags() {
   ]);
 
   function conditionHandle(item, previous, next) {
+    const currentName = route.name || '';
+    const itemName = item.name || '';
     if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) {
       if (Object.keys(route.query).length > 0) {
-        return isEqual(route.query, item.query) ? previous : next;
+        return currentName === itemName && isEqual(route.query, item.query) ? previous : next;
       } else {
-        return isEqual(route.params, item.params) ? previous : next;
+        return currentName === itemName && isEqual(route.params, item.params) ? previous : next;
       }
     } else {
-      return route.path === item.path ? previous : next;
+      return currentName === itemName ? previous : next;
     }
   }
 

package/src/layout/types.ts

@@ -1,8 +1,8 @@
 /*
  * @Author: wei.li
  * @Date: 2021-11-17 16:02:30
- * @LastEditors: wei.li
- * @LastEditTime: 2024-06-27 13:51:19
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-10-19 12:07:59
  * @Description: file content
  */
 
@@ -11,6 +11,7 @@ import type { IconifyIcon } from '@iconify/vue';
 export const routerArrays: Array<RouteConfigs> = [
   {
     path: '/welcome',
+    name: 'Welcome',
     meta: {
       title: 'message.udp.home',
       icon: 'home-filled'

package/src/main.ts

@@ -2,7 +2,7 @@
  * @Author: levi7754 levi7754@163.com
  * @Date: 2025-07-25 13:38:20
  * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-09-11 16:21:38
+ * @LastEditTime: 2025-10-19 12:15:08
  * @FilePath: \udp-front\packages\udp-core\src\main.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -26,28 +26,29 @@ import './style/reset.scss';
 // 导入公共样式
 import './style/index.scss';
 
-import 'viewerjs/dist/viewer.css';
+// import 'viewerjs/dist/viewer.css';
 
-import VueViewer from 'v-viewer';
+// import VueViewer from 'v-viewer';
 
 // import SuTable from './components/SuTable/SuTable.vue';
 
-// import {
-//   UtButton,
-// utLov2,
-// UGrid,
-//   UtDivider,
-// UtModalForm2
-// FormUpload2,
-// UtForm2
-// UtGrid2
-//   UtContent,
-// UtModalGrid2
-// UtUpload2
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
+import {
+  // UtButton,
+  // utLov2,
+  // UGrid,
+  //   UtDivider,
+  // UtModalForm2
+  // FormUpload2,
+  // UtForm2
+  UtGrid2
+  // UtContent2,
+  // UtStampBadge2
+  // UtModalGrid2
+  // UtUpload2
+  //   UtIconSelect,
+  //   UtCalendar
+  // uAttachment
+} from './components/udp';
 
 const app = createApp(App);
 
@@ -92,14 +93,16 @@ const init = ({ router, config, lang, views, env, tableConfig }) => {
     // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
     //   .component('UtDivider', UtDivider)
     // app.component('UtModalForm2', UtModalForm2);
-    // app.component('UtGrid2', UtGrid2);
+    app.component('UtGrid2', UtGrid2);
     // app.component('UtForm2', UtForm2);
     // app.component('UtModalGrid2', UtModalGrid2);
     //   .component('UtIconSelect', UtIconSelect)
     // app.component('FormUpload2', FormUpload2);
     //   .component('UtCalendar', UtCalendar)
+    // app.component('UtContent2', UtContent2);
+    // app.component('UtStampBadge2', UtStampBadge2);
     //   .component('UtModalGrid', UtModalGrid);
-    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
+    // app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
     setGlobal(app);
     setBaseUrl(getBaseURL());
     setGlobalDirective(app);