@utogether/udp-core 1.0.1-beta.3 → 1.0.1-beta.30

package/src/layout/hooks/useTag.ts

@@ -1,13 +1,4 @@
-import {
-  ref,
-  unref,
-  watch,
-  computed,
-  reactive,
-  onMounted,
-  type CSSProperties,
-  getCurrentInstance
-} from 'vue';
+import { ref, unref, watch, computed, reactive, onMounted, type CSSProperties, getCurrentInstance } from 'vue';
 import type { tagsViewsType } from '../types';
 import { isEqual, isBoolean } from 'xe-utils';
 import { useEventListener } from '@vueuse/core';
@@ -33,12 +24,9 @@ export function useTags() {
   const currentSelect = ref({});
 
   /** 显示模式，默认灵动模式 */
-  const showModel = ref(
-    storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.showModel || 'smart'
-  );
+  const showModel = ref(storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.showModel || 'smart');
   /** 是否隐藏标签页，默认显示 */
-  const showTags =
-    ref(storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.hideTabs) ?? ref('false');
+  const showTags = ref(storageLocal.getItem(`${responsiveStorageNameSpace()}configure`)?.hideTabs) ?? ref('false');
   const multiTags: any = computed(() => {
     return useMultiTagsStoreHook().multiTags;
   });
@@ -103,14 +91,20 @@ 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;
+        if (item.params) {
+          return currentName === itemName && isEqual(route.params, item.params) ? previous : next;
+        } else {
+          return currentName === itemName ? 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

@@ -1,110 +1,115 @@
-/*
- * @Author: wei.li
- * @Date: 2022-10-18 18:13:54
- * @LastEditors: levi7754 levi7754@163.com
- * @LastEditTime: 2025-07-21 11:28:01
- * @Description: file content
- */
-import { createApp, type Directive } from 'vue';
-import App from './App.vue';
-import router from './router';
-import { setViews } from './router';
-import { setupStore } from './store';
-import { setConfig, setSystemEnv } from './config';
-import { useI18n } from '../src/plugins/i18n';
-import { setTableConfig } from '../src/plugins/vxe-table';
-import { injectResponsiveStorage } from './utils/storage';
-import hasAuthority from './utils/authority';
-import { getServiceApi, getBaseURL, setRouter } from './api';
-
-import 'nprogress/nprogress.css';
-// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
-import './style/tailwind.css';
-// // 引入重置样式
-import './style/reset.scss';
-// 导入公共样式
-import './style/index.scss';
-
-import 'viewerjs/dist/viewer.css';
-
-import VueViewer from 'v-viewer';
-
-// import SuTable from './components/SuTable/SuTable.vue';
-
-// import {
-//   UtButton,
-// utLov2,
-// UGrid,
-//   UtDivider,
-// UtModalForm2,
-// FormUpload2
-//   UtForm,
-// UtGrid2
-//   UtContent,
-//   UtCountdown,
-//   UtIconSelect,
-//   UtCalendar
-// uAttachment
-// } from './components/udp';
-
-const app = createApp(App);
-
-// 全局注册`@iconify/vue`图标库
-import { IconifyIconOffline, FontIcon } from './components/ReIcon';
-// 全局注册`vue-tippy`
-import 'tippy.js/dist/tippy.css';
-import 'tippy.js/animations/perspective.css';
-import VueTippy from 'vue-tippy';
-
-app.use(VueTippy, {
-  defaultProps: { animation: 'perspective' }
-});
-
-// 自定义指令
-import * as directives from './directives';
-
-const setGlobal = app => {
-  app.config.globalProperties.$hasAuthority = hasAuthority;
-  app.config.globalProperties.$serviceApi = getServiceApi();
-  app.config.globalProperties.$url = getBaseURL();
-};
-
-const setGlobalDirective = app => {
-  Object.keys(directives).forEach(key => {
-    app.directive(key, (directives as { [key: string]: Directive })[key]);
-  });
-};
-
-const init = ({ config, lang, views, env, tableConfig }) => {
-  app.use(router);
-  setRouter(router);
-  setConfig(app, config);
-  setSystemEnv(env);
-  setViews(views);
-  setTableConfig(tableConfig);
-  return new Promise(resolve => {
-    useI18n(app, lang);
-    app.component('IconifyIconOffline', IconifyIconOffline);
-    app.component('FontIcon', FontIcon);
-    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
-    //   .component('UtDivider', UtDivider)
-    // .component('UtModalForm2', UtModalForm2)
-    // app.component('UtGrid2', UtGrid2);
-    //   .component('UtForm', UtForm)
-    //   .component('UtContent', UtContent)
-    //   .component('UtIconSelect', UtIconSelect)
-    //   .component('UtCountdown', UtCountdown)
-    //   .component('UtCalendar', UtCalendar)
-    //   .component('UtModalGrid', UtModalGrid);
-    app.use(VueViewer, { defaultOptions: { zIndex: 9999 } });
-    setGlobal(app);
-    setGlobalDirective(app);
-    // 全局组件
-    setupStore(app);
-    injectResponsiveStorage(app, config);
-    const result = { app, router };
-    resolve(result);
-  });
-};
-
-export default init;
+/*
+ * @Author: levi7754 levi7754@163.com
+ * @Date: 2025-07-25 13:38:20
+ * @LastEditors: levi7754 levi7754@163.com
+ * @LastEditTime: 2025-11-14 10:52:54
+ * @FilePath: \udp-front\packages\udp-core\src\main.ts
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+import { createApp, type Directive } from 'vue';
+import App from './App.vue';
+// import router from './router';
+import { setViews } from './router';
+import { setupStore } from './store';
+import { setConfig, setSystemEnv } from './config';
+import { useI18n, transformI18n } from '../src/plugins/i18n';
+import { setTableConfig } from '../src/plugins/vxe-table';
+import { injectResponsiveStorage } from './utils/storage';
+import hasAuthority from './utils/authority';
+import { getServiceApi, getBaseURL, setRouter, setBaseUrl } from './api';
+
+import 'nprogress/nprogress.css';
+// 一定要在main.ts中导入tailwind.css，防止vite每次hmr都会请求src/style/index.scss整体css文件导致热更新慢的问题
+import './style/tailwind.css';
+// // 引入重置样式
+import './style/reset.scss';
+// 导入公共样式
+import './style/index.scss';
+
+// import 'viewerjs/dist/viewer.css';
+
+// import VueViewer from 'v-viewer';
+
+// import SuTable from './components/SuTable/SuTable.vue';
+
+// import {
+// utLov2,
+//   UtDivider,
+// UtModalForm2
+// FormUpload2,
+// UtForm2,
+// UtGrid2
+// UtContent2
+// UtStampBadge2
+// UtModalGrid2
+// UtUpload2
+//   UtIconSelect,
+//   UtCalendar
+// uAttachment
+// } from './components/udp';
+
+const app = createApp(App);
+
+// 全局注册`@iconify/vue`图标库
+import { IconifyIconOffline, FontIcon } from './components/ReIcon';
+// 全局注册`vue-tippy`
+import 'tippy.js/dist/tippy.css';
+import 'tippy.js/animations/perspective.css';
+import VueTippy from 'vue-tippy';
+
+app.use(VueTippy, {
+  defaultProps: { animation: 'perspective' }
+});
+
+// 自定义指令
+import * as directives from './directives';
+
+const setGlobal = app => {
+  app.config.globalProperties.$hasAuthority = hasAuthority;
+  app.config.globalProperties.$serviceApi = getServiceApi();
+  app.config.globalProperties.$url = getBaseURL();
+  window.$i18n = transformI18n;
+};
+
+const setGlobalDirective = app => {
+  Object.keys(directives).forEach(key => {
+    app.directive(key, (directives as { [key: string]: Directive })[key]);
+  });
+};
+
+const init = ({ router, config, lang, views, env, tableConfig }) => {
+  setViews(views, router);
+  app.use(router);
+  setRouter(router);
+  setConfig(app, config);
+  setSystemEnv(env);
+  setTableConfig(tableConfig);
+  return new Promise(resolve => {
+    useI18n(app, lang);
+    app.component('IconifyIconOffline', IconifyIconOffline);
+    app.component('FontIcon', FontIcon);
+    // app.component('uAttachment', uAttachment).component('UGrid', UGrid);
+    //   .component('UtDivider', UtDivider)
+    // app.component('UtModalForm2', UtModalForm2);
+    // 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 } });
+    setGlobal(app);
+    setBaseUrl(getBaseURL());
+    setGlobalDirective(app);
+    // 全局组件
+    setupStore(app);
+    injectResponsiveStorage(app, config);
+    const result = { app, router };
+    resolve(result);
+  });
+};
+
+export default init;