From c9bde0b7daca33a22e77cb018242188c4d816cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E6=B5=A9?= <me@yanhao.ren>
Date: Thu, 19 Dec 2024 13:11:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20utils4u=20?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=87=B3=202.18.1=EF=BC=8C=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20PrimeVue=20=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto-imports.d.ts                            |  4 +
 package.json                                 |  2 +-
 pnpm-lock.yaml                               | 10 +--
 src/components/primevue/__dialog-content.vue |  4 +-
 src/components/primevue/fns.tsx              |  3 +-
 src/plugins/primevue.ts                      | 78 +-------------------
 src/plugins/router.ts                        | 18 ++---
 vite.config.plugins.ts                       |  2 +-
 8 files changed, 23 insertions(+), 98 deletions(-)

diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index c4bfed0..17035b0 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -6,7 +6,10 @@
 // biome-ignore lint: disable
 export {}
 declare global {
+  const ConfirmationService: typeof import('utils4u/primevue')['ConfirmationService']
+  const DialogService: typeof import('utils4u/primevue')['DialogService']
   const EffectScope: typeof import('vue')['EffectScope']
+  const ToastService: typeof import('utils4u/primevue')['ToastService']
   const acceptHMRUpdate: typeof import('pinia')['acceptHMRUpdate']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
@@ -242,6 +245,7 @@ declare global {
   const usePreferredLanguages: typeof import('@vueuse/core')['usePreferredLanguages']
   const usePreferredReducedMotion: typeof import('@vueuse/core')['usePreferredReducedMotion']
   const usePrevious: typeof import('@vueuse/core')['usePrevious']
+  const usePrimevueDialogRef: typeof import('utils4u/primevue')['usePrimevueDialogRef']
   const useRafFn: typeof import('@vueuse/core')['useRafFn']
   const useRefHistory: typeof import('@vueuse/core')['useRefHistory']
   const useRefs: typeof import('utils4u/vue-use')['useRefs']
diff --git a/package.json b/package.json
index 8c5f57f..d280f28 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "taze": "^0.18.0",
     "tdesign-icons-vue-next": "^0.3.3",
     "ts-enum-util": "^4.1.0",
-    "utils4u": "^2.17.0",
+    "utils4u": "^2.18.1",
     "vant": "^4.9.15",
     "vite-plugin-webfont-dl": "^3.10.3",
     "vue": "^3.5.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 18af483..03fe4a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -83,8 +83,8 @@ importers:
         specifier: ^4.1.0
         version: 4.1.0
       utils4u:
-        specifier: ^2.17.0
-        version: 2.17.0
+        specifier: ^2.18.1
+        version: 2.18.1
       vant:
         specifier: ^4.9.15
         version: 4.9.15(vue@3.5.13(typescript@5.7.2))
@@ -4756,8 +4756,8 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  utils4u@2.17.0:
-    resolution: {integrity: sha512-66k6/FlZxSwauQGuFJARA3KleXi8ypSrtbHBAzWSETeMTarEFPoAWrfl2fWHC6wxWCg9oWK1zHjtPL9BQkKjqw==}
+  utils4u@2.18.1:
+    resolution: {integrity: sha512-FTKfiwFUZLxp5UMLLilcQFWF/WZq2pZpk0Dg/Q8LLDJEHHN0QlMOm+25p6+tI0lDArC6uG/zmA/d9SnlU720AA==}
 
   uuid@3.3.2:
     resolution: {integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==}
@@ -10108,7 +10108,7 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  utils4u@2.17.0: {}
+  utils4u@2.18.1: {}
 
   uuid@3.3.2: {}
 
diff --git a/src/components/primevue/__dialog-content.vue b/src/components/primevue/__dialog-content.vue
index 4edadc1..9bac725 100644
--- a/src/components/primevue/__dialog-content.vue
+++ b/src/components/primevue/__dialog-content.vue
@@ -1,7 +1,5 @@
 <script setup lang="ts">
-import { useDialogRef } from '@/plugins/primevue';
-
-const dialogRef = useDialogRef();
+const dialogRef = usePrimevueDialogRef();
 </script>
 
 <template>
diff --git a/src/components/primevue/fns.tsx b/src/components/primevue/fns.tsx
index 3198388..1e7a21d 100644
--- a/src/components/primevue/fns.tsx
+++ b/src/components/primevue/fns.tsx
@@ -1,4 +1,3 @@
-import { ConfirmationService, DialogService, ToastService, useDialogRef } from '@/plugins/primevue';
 import dialogContent from './__dialog-content.vue';
 
 const dynamicComponent = defineComponent({
@@ -9,7 +8,7 @@ const dynamicComponent = defineComponent({
     },
   },
   setup(props, ctx) {
-    const dialogRef = useDialogRef();
+    const dialogRef = usePrimevueDialogRef();
     return () => (
       <div>
         <button onClick={() => ctx.emit('close')}>emit('close')</button> <hr />
diff --git a/src/plugins/primevue.ts b/src/plugins/primevue.ts
index 90a147e..9ebd106 100644
--- a/src/plugins/primevue.ts
+++ b/src/plugins/primevue.ts
@@ -8,81 +8,7 @@ import Aura from '@primevue/themes/aura';
 import zhCN from 'primelocale/zh-CN.json';
 import PrimeVue from 'primevue/config';
 
-// ========================================================================
-// ========================== ConfirmationService =========================
-// ========================================================================
-// @ts-expect-error - Ignore missing types
-import ConfirmationEventBus from 'primevue/confirmationeventbus';
-
-import type { ConfirmationOptions } from 'primevue/confirmationoptions';
-interface HConfirmationOptions extends ConfirmationOptions {
-  rejectProps?: import('primevue/button').ButtonProps;
-  acceptProps?: import('primevue/button').ButtonProps;
-}
-const ConfirmationService = {
-  require: (options: HConfirmationOptions) => {
-    ConfirmationEventBus.emit('confirm', options);
-  },
-  close: () => {
-    ConfirmationEventBus.emit('close');
-  },
-};
-
-// ========================================================================
-// ============================= ToastService =============================
-// ========================================================================
-// @ts-expect-error - Ignore missing types
-import ToastEventBus from 'primevue/toasteventbus';
-
-import type { ToastServiceMethods } from 'primevue/toastservice';
-// https://github.com/primefaces/primevue/blob/61929eae7526015af0362fc5889f2af7527403d1/packages/primevue/src/toastservice/ToastService.js
-const ToastService: ToastServiceMethods = {
-  add: (message) => {
-    ToastEventBus.emit('add', message);
-  },
-  remove: (message) => {
-    ToastEventBus.emit('remove', message);
-  },
-  removeGroup: (group) => {
-    ToastEventBus.emit('remove-group', group);
-  },
-  removeAllGroups: () => {
-    ToastEventBus.emit('remove-all-groups');
-  },
-};
-
-// ========================================================================
-// ============================= DialogService ============================
-// ========================================================================
-// @ts-expect-error - Ignore missing types
-import DynamicDialogEventBus from 'primevue/dynamicdialogeventbus';
-
-import type { DialogServiceMethods } from 'primevue/dialogservice';
-
-// https://github.com/primefaces/primevue/blob/18367429f624285ff32d0ef775c1825a43a02fb1/packages/primevue/src/dialogservice/DialogService.js#L7
-const DialogService: DialogServiceMethods = {
-  open: (content, options) => {
-    const instance = {
-      content: content && markRaw(content),
-      options: options || {},
-      data: options && options.data,
-      close: (params: unknown) => {
-        DynamicDialogEventBus.emit('close', { instance, params });
-      },
-    };
-
-    DynamicDialogEventBus.emit('open', { instance });
-
-    return instance;
-  },
-};
-
-function useDialogRef() {
-  type DialogRef = ComputedRef<import('primevue/dynamicdialogoptions').DynamicDialogInstance>;
-  return inject<DialogRef>('dialogRef');
-}
-
-function setupPrimeVue(app: import('vue').App) {
+export function setupPrimeVue(app: import('vue').App) {
   app.use(PrimeVue, {
     locale: {
       ...zhCN['zh-CN'],
@@ -98,5 +24,3 @@ function setupPrimeVue(app: import('vue').App) {
     },
   });
 }
-
-export { ConfirmationService, DialogService, setupPrimeVue, ToastService, useDialogRef };
diff --git a/src/plugins/router.ts b/src/plugins/router.ts
index fdd36aa..974b7de 100644
--- a/src/plugins/router.ts
+++ b/src/plugins/router.ts
@@ -1,5 +1,4 @@
 import { DataLoaderPlugin } from 'unplugin-vue-router/data-loaders';
-import { createLogGuard, createProgressGuard, createStackGuard } from 'utils4u/vue-router';
 import { createRouter, createWebHistory } from 'vue-router';
 import { handleHotUpdate, routes } from 'vue-router/auto-routes';
 
@@ -17,15 +16,16 @@ if ($__DEV__) Object.assign(window, { router });
 
 function setupRouter(app: import('vue').App) {
   app
-    // Register the plugin before the router
-    .use(DataLoaderPlugin, { router })
-    // adding the router will trigger the initial navigation
-    .use(router);
-
+    .use(DataLoaderPlugin, { router }) // Register the plugin before the router
+    .use(router); // adding the router will trigger the initial navigation
+}
+export { router, setupRouter };
+// ========================================================================
+// =========================== Router Guards ==============================
+// ========================================================================
+{
   // 警告：路由守卫的创建顺序会影响执行流程，请勿调整
-  createProgressGuard(router);
+  createNProgressGuard(router);
   createLogGuard(router);
   Object.assign(window, { stack: createStackGuard(router) });
 }
-
-export { router, setupRouter };
diff --git a/vite.config.plugins.ts b/vite.config.plugins.ts
index 641faa2..312f540 100644
--- a/vite.config.plugins.ts
+++ b/vite.config.plugins.ts
@@ -53,7 +53,7 @@ export function Plugins() {
         '@vueuse/core',
         VueRouterAutoImports,
         unheadVueComposablesImports,
-        createUtils4uAutoImports(),
+        createUtils4uAutoImports(['primevue']),
         'vue-i18n',
       ],
     }),