@duxweb/dvha-core 0.0.4 → 0.0.6

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @duxweb/dvha-core
 
+## 0.0.6
+
+### Patch Changes
+
+- fix: dependencie @tanstack/vue-query
+
+## 0.0.5
+
+### Patch Changes
+
+- 增加 loader 加载器类型
+
 ## 0.0.4
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@duxweb/dvha-core",
   "type": "module",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "author": "DuxWeb",
   "license": "LGPL-3.0",
   "repository": {
@@ -11,7 +11,7 @@
   "main": "src/index.ts",
   "dependencies": {
     "@overlastic/vue": "^0.8.1",
-    "@tanstack/react-query": "^5.76.1",
+    "@tanstack/vue-query": "^5.76.2",
     "@vueuse/core": "^13.2.0",
     "@vueuse/integrations": "^13.2.0",
     "axios": "^1.9.0",
@@ -19,9 +19,8 @@
     "pinia": "^3.0.2",
     "pinia-plugin-persistedstate": "^4.3.0",
     "vue": "^3.5.14",
-    "vue-router": "4"
-  },
-  "devDependencies": {
+    "vue-router": "4",
     "clsx": "^2.1.1"
-  }
+  },
+  "devDependencies": {}
 }

package/src/hooks/data.ts

@@ -1,13 +1,12 @@
-import type { DefaultError, DefinedInitialDataInfiniteOptions, InfiniteData, QueryKey, UndefinedInitialDataOptions, UseMutationOptions } from '@tanstack/react-query'
+import type { DefaultError, DefinedInitialDataInfiniteOptions, DefinedInitialQueryOptions, InfiniteData, QueryKey, UseMutationOptions } from '@tanstack/vue-query'
 import type { IDataProviderCreateManyOptions, IDataProviderCreateOptions, IDataProviderCustomOptions, IDataProviderDeleteManyOptions, IDataProviderDeleteOptions, IDataProviderGetManyOptions, IDataProviderGetOneOptions, IDataProviderListOptions, IDataProviderResponse, IDataProviderUpdateManyOptions, IDataProviderUpdateOptions } from '../types'
-import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useInfiniteQuery, useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, watch } from 'vue'
 import { useError, useGetAuth } from './auth'
 import { useManage } from './manage'
-import { useAuthStore } from 'src/stores'
 
-type IDataQueryOptions = UndefinedInitialDataOptions<IDataProviderResponse | undefined, DefaultError, IDataProviderResponse | undefined, QueryKey>
-type IDataQueryOptionsInfinite = DefinedInitialDataInfiniteOptions<IDataProviderResponse | undefined, DefaultError, InfiniteData<IDataProviderResponse | undefined>, QueryKey, number>
+type IDataQueryOptions = DefinedInitialQueryOptions<IDataProviderResponse | undefined, DefaultError, IDataProviderResponse | undefined, any>
+type IDataQueryOptionsInfinite = DefinedInitialDataInfiniteOptions<IDataProviderResponse | undefined, DefaultError, InfiniteData<IDataProviderResponse | undefined>, any, number>
 
 interface IListParams extends IDataProviderListOptions {
   options?: IDataQueryOptions

package/src/provider/app.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, inject, Ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { RouteRecordRaw, useRouter } from 'vue-router'
 import { useConfig, useManage } from '../hooks'
 import { useAuthStore, useRouteStore } from '../stores'
 import { storeToRefs } from 'pinia'
@@ -127,12 +127,33 @@ export const DuxAppProvider = defineComponent({
             return
           }
 
-          router.addRoute(`${manageName}.auth`, {
+          const route: Partial<RouteRecordRaw>  = {
             name: item.name,
             path: item.path,
-            component: typeof item.component === 'function' ? item.component : () => import('../components/loader/iframe'),
             meta: item.meta,
-          })
+          }
+
+
+          switch (item.loader) {
+            case 'iframe':
+              route.component = manage.config?.components?.iframe
+              break
+            case 'link':
+              route.beforeEnter = () => {
+                const url = item.meta?.url || item.path
+                if (url) {
+                  window.open(url, '_blank')
+                }
+                return false
+              }
+              route.component = () => Promise.resolve({ template: '<div></div>' })
+              break
+            default:
+              route.component = typeof item.component === 'string' ? () => import(item.component as string) : item.component
+              break
+          }
+
+          router.addRoute(`${manageName}.auth`, route as RouteRecordRaw)
         })
 
 

package/src/types/config.ts

@@ -46,4 +46,6 @@ export interface IConfigComponent {
   notFound?: RouteComponent // 未找到布局
   notAuthorized?: RouteComponent // 未授权布局
   error?: RouteComponent // 错误布局
+
+  iframe?: RouteComponent // iframe 组件
 }

package/src/types/menu.ts

@@ -15,10 +15,10 @@ export interface IMenu {
   parent?: string
   // 是否隐藏
   hidden?: boolean
-  // 菜单加载器
+  // 菜单加载器 ('iframe' | 'link' | 'component')
   loader?: string
   // 菜单组件
-  component?: RouteComponent
-  // 菜单元数据
+  component?: RouteComponent | string
+  // 菜单元数据 (当 loader 为 'link' 时，可在 meta.url 中设置外部链接地址)
   meta?: Record<string, any>
 }