(storageKey, version, 'localStorage')
+ }
+
+ return {
+ modalShow,
+ logout,
+ }
+ },
+ render() {
+ const { logout } = this
+
+ return (
+
+ {
+ this.modalShow = false
+ }}
+ />
+
+ )
+ },
+})
diff --git a/src/app-components/provider/AppStyleProvider/index.scss b/src/app-components/provider/provider.scss
similarity index 100%
rename from src/app-components/provider/AppStyleProvider/index.scss
rename to src/app-components/provider/provider.scss
diff --git a/src/app-config/appConfig.ts b/src/app-config/appConfig.ts
index aec231b0..8411abaa 100644
--- a/src/app-config/appConfig.ts
+++ b/src/app-config/appConfig.ts
@@ -11,12 +11,8 @@
/** 系统配置 */
-import type {
- LayoutSideBarLogo,
- PreloadingConfig,
- RootRoute,
-} from '@/types/modules/cfg'
-import type { AppMenuConfig, AppKeepAlive } from '@/types/modules/appConfig'
+import type { LayoutSideBarLogo, PreloadingConfig } from '@/types'
+import type { AppMenuConfig, AppKeepAlive } from '@/types'
/**
*
@@ -44,21 +40,6 @@ export const PRE_LOADING_CONFIG: PreloadingConfig = {
titleColor: '#2d8cf0',
}
-/**
- *
- * 配置根路由信息
- * 模板维护一个根路由 ROOT_ROUTE，所有的重定向操作、回到 Layout Root Path 操作都依赖该 path
- *
- * 该变量的值，会传递给 globalRootRoute
- * 这么做也是为了能够在兼容老版本的模板，并且也是为了能够动态的维护根路由信息
- *
- * 有些时候，如果你希望动态的维护 Root Route 信息，可以使用 useAppRoot 方法
- */
-export const ROOT_ROUTE: RootRoute = {
- name: 'Dashboard',
- path: '/dashboard',
-}
-
/**
*
* icon: LOGO 图标, 依赖 `RIcon` 实现(如果为空则不会渲染图标)
@@ -111,19 +92,3 @@ export const APP_CATCH_KEY = {
localeLanguage: 'localeLanguage',
token: 'token',
} as const
-
-/**
- *
- * 系统水印配置
- * 具体配置信息查看官网: https://www.naiveui.com/zh-CN/dark/components/watermark#API
- */
-export const APP_WATERMARK_CONFIG = {
- content: 'Trying be better~',
- fontSize: 16,
- lineHeight: 16,
- width: 384,
- height: 384,
- xOffset: 12,
- yOffset: 60,
- rotate: -15,
-} as const
diff --git a/src/app-config/designConfig.ts b/src/app-config/designConfig.ts
index 845ed7b2..6708bab3 100644
--- a/src/app-config/designConfig.ts
+++ b/src/app-config/designConfig.ts
@@ -11,7 +11,7 @@
/** 系统颜色风格配置入口 */
-import type { AppTheme } from '@/types/modules/cfg'
+import type { AppTheme } from '@/types'
export const APP_THEME: AppTheme = {
/**
@@ -65,6 +65,8 @@ export const APP_THEME: AppTheme = {
*
* 配置 echart 主题颜色
* 约定配置时以：主题名称为文件名，其文件夹下两个主题风格的 json 文件。并且暗色主题必须为 xxx-dark.json
+ *
+ * [文档地址](https://xiaodaigua-ray.github.io/ray-template-doc/ray-template-docs/advanced/echart-themes.html)
*/
echartTheme: 'macarons',
}
diff --git a/src/app-config/localConfig.ts b/src/app-config/localConfig.ts
index 79fa9415..9834f3ef 100644
--- a/src/app-config/localConfig.ts
+++ b/src/app-config/localConfig.ts
@@ -11,12 +11,8 @@
/** 国际化相关配置 */
-import type {
- TemplateLocale,
- LocalOptions,
- DayjsLocalMap,
-} from '@/types/modules/appConfig'
-import type { ValueOf } from '@/types/modules/helper'
+import type { TemplateLocale, LocalOptions, DayjsLocalMap } from '@/types'
+import type { ValueOf } from '@/types'
/**
*
diff --git a/src/app-config/requestConfig.ts b/src/app-config/requestConfig.ts
index 7e9e1fb5..c8bc8e31 100644
--- a/src/app-config/requestConfig.ts
+++ b/src/app-config/requestConfig.ts
@@ -9,7 +9,7 @@
* @remark 今天也是元气满满撸代码的一天
*/
-import type { AxiosConfig } from '@/types/modules/appConfig'
+import type { AxiosConfig } from '@/types'
/** axios 相关配置 */
export const AXIOS_CONFIG: AxiosConfig = {
diff --git a/src/axios/helper/interceptor.ts b/src/axios/helper/interceptor.ts
index 2b9e0f17..9f0588b2 100644
--- a/src/axios/helper/interceptor.ts
+++ b/src/axios/helper/interceptor.ts
@@ -32,7 +32,7 @@ import type {
AxiosFetchInstance,
AxiosFetchError,
} from '@/axios/type'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
/** 当前请求的实例 */
const axiosFetchInstance: AxiosFetchInstance = {
diff --git a/src/axios/inject/request/provider.ts b/src/axios/inject/request/provider.ts
index 9decae3a..11f37547 100644
--- a/src/axios/inject/request/provider.ts
+++ b/src/axios/inject/request/provider.ts
@@ -30,7 +30,7 @@ import type {
BeforeFetchFunction,
FetchErrorFunction,
} from '@/axios/type'
-import type { Recordable } from '@/types/modules/helper'
+import type { Recordable } from '@/types'
/**
*
diff --git a/src/axios/inject/response/provider.ts b/src/axios/inject/response/provider.ts
index 3fbcb5e1..137fb587 100644
--- a/src/axios/inject/response/provider.ts
+++ b/src/axios/inject/response/provider.ts
@@ -27,7 +27,7 @@ import type {
BeforeFetchFunction,
FetchErrorFunction,
} from '@/axios/type'
-import type { Recordable } from '@/types/modules/helper'
+import type { Recordable } from '@/types'
/**
*
diff --git a/src/axios/type.ts b/src/axios/type.ts
index 191c486a..4dcdb019 100644
--- a/src/axios/type.ts
+++ b/src/axios/type.ts
@@ -7,7 +7,7 @@ import type {
Axios,
AxiosResponse,
} from 'axios'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
export type AxiosHeaderValue =
| AxiosHeaders
diff --git a/src/components/RChart/src/index.tsx b/src/components/RChart/src/index.tsx
index 30b06bf4..99ee4044 100644
--- a/src/components/RChart/src/index.tsx
+++ b/src/components/RChart/src/index.tsx
@@ -49,7 +49,7 @@ import { RMoreDropdown } from '@/components'
import { useSettingGetters } from '@/store'
import type { WatchStopHandle } from 'vue'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
import type { DebouncedFunc } from 'lodash-es'
import type { UseResizeObserverReturn } from '@vueuse/core'
import type { ECharts, EChartsCoreOption } from 'echarts/core'
@@ -124,9 +124,7 @@ export default defineComponent({
try {
echarts.use(props.use?.filter(Boolean))
} catch (e) {
- console.error(
- 'register chart Core error: wrong property and method passed in extend attribute',
- )
+ console.error('RChart register error: ', e)
}
}
@@ -249,6 +247,7 @@ export default defineComponent({
}
}
+ // chart 是否已经销毁
const isDispose = () => !!(echartInst && echartInst.getDom())
/**
@@ -270,6 +269,14 @@ export default defineComponent({
}
}
+ /**
+ *
+ * @param key moreDropDownOptions key
+ * @param option moreDropDownOptions current click option
+ *
+ * 预设 card 风格下拉框点击
+ * 当前仅实现下载图片功能
+ */
const dropdownSelect = (key: string | number, option: DropdownOption) => {
if (key === 'downloadChart' && isDispose()) {
const { filename, ...args } = props.downloadOptions
@@ -303,7 +310,6 @@ export default defineComponent({
if (props.autoResize) {
resizeThrottleReturn = throttle(resizeChart, props.throttleWait)
/** 监听内容区域尺寸变化更新 chart */
-
resizeObserverReturn = useResizeObserver(
props.observer || rayChartWrapperRef,
resizeThrottleReturn,
@@ -336,7 +342,6 @@ export default defineComponent({
}
},
)
-
/**
*
* 贴花跟随主题渲染
@@ -350,7 +355,6 @@ export default defineComponent({
updateChartTheme()
},
)
-
watchEffect(() => {
/** 监听 options 变化 */
if (props.watchOptions) {
@@ -367,6 +371,7 @@ export default defineComponent({
echartInst?.setOption(options, setOpt)
},
{
+ // 深度监听 options
deep: true,
},
)
@@ -383,6 +388,7 @@ export default defineComponent({
echart: echartInstanceRef,
dispose: unmount,
render: mount,
+ isDispose,
})
onBeforeMount(async () => {
diff --git a/src/components/RChart/src/props.ts b/src/components/RChart/src/props.ts
index a7535180..287d588c 100644
--- a/src/components/RChart/src/props.ts
+++ b/src/components/RChart/src/props.ts
@@ -1,6 +1,6 @@
import type * as echarts from 'echarts/core' // `echarts` 核心模块
import type { PropType, VNode } from 'vue'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { MaybeArray } from '@/types'
import type {
LoadingOptions,
AutoResize,
@@ -52,6 +52,7 @@ const props = {
type: Array as PropType,
},
preset: {
+ // 是否启用预设样式
type: String as PropType,
},
contentStyle: {
@@ -153,6 +154,8 @@ const props = {
*
* 拓展 `echarts` 图表
* 用于自己手动拓展相关的包
+ *
+ * 注意，该方法不支持动态调用，及时动态更新了该属性，也不会生效
*/
type: Array as PropType,
default: () => [],
diff --git a/src/components/RCollapseGrid/src/props.ts b/src/components/RCollapseGrid/src/props.ts
index c9e97dda..aa3202ef 100644
--- a/src/components/RCollapseGrid/src/props.ts
+++ b/src/components/RCollapseGrid/src/props.ts
@@ -2,7 +2,7 @@ import { gridProps } from 'naive-ui'
import type { PropType } from 'vue'
import type { CollapseToggleText } from './type'
-import type { AnyFC, MaybeArray } from '@/types/modules/utils'
+import type { AnyFC, MaybeArray } from '@/types'
const props = {
open: {
diff --git a/src/components/RIcon/src/props.ts b/src/components/RIcon/src/props.ts
index bce58a2e..f071751c 100644
--- a/src/components/RIcon/src/props.ts
+++ b/src/components/RIcon/src/props.ts
@@ -10,7 +10,7 @@
*/
import type { PropType } from 'vue'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { MaybeArray } from '@/types'
const props = {
color: {
diff --git a/src/components/RIframe/src/props.ts b/src/components/RIframe/src/props.ts
index d5b0d5d9..9f37c49c 100644
--- a/src/components/RIframe/src/props.ts
+++ b/src/components/RIframe/src/props.ts
@@ -10,7 +10,7 @@
*/
import type { PropType } from 'vue'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { MaybeArray } from '@/types'
import type { SpinProps } from 'naive-ui'
const props = {
diff --git a/src/components/RModal/src/Modal.tsx b/src/components/RModal/src/Modal.tsx
index ccec2433..2cc8aaf1 100644
--- a/src/components/RModal/src/Modal.tsx
+++ b/src/components/RModal/src/Modal.tsx
@@ -32,6 +32,11 @@ export default defineComponent({
}))
const uuidEl = uuid()
let intractable: null | ReturnType
+ // 记录拖拽的位置
+ const position = {
+ x: 0,
+ y: 0,
+ }
/**
*
@@ -44,7 +49,16 @@ export default defineComponent({
const target = document.getElementById(uuidEl)
if (target) {
- setupDraggable(target, props.preset).then((res) => {
+ setupDraggable(target, props.preset, {
+ scheduler: (event) => {
+ const target = event.target
+
+ position.x += event.dx
+ position.y += event.dy
+
+ target.style.transform = `translate(${position.x}px, ${position.y}px)`
+ },
+ }).then((res) => {
intractable = res
})
}
@@ -60,6 +74,12 @@ export default defineComponent({
) {
nextTick(() => {
setupInteract()
+
+ const target = document.getElementById(uuidEl)
+
+ if (props.memo && target) {
+ target.style.transform = `translate(${position.x}px, ${position.y}px)`
+ }
})
} else {
intractable?.unset()
@@ -67,6 +87,9 @@ export default defineComponent({
intractable = null
}
},
+ {
+ immediate: true,
+ },
)
return {
diff --git a/src/components/RModal/src/props.ts b/src/components/RModal/src/props.ts
index 0e922828..338e2c3f 100644
--- a/src/components/RModal/src/props.ts
+++ b/src/components/RModal/src/props.ts
@@ -13,6 +13,16 @@ import { modalProps } from 'naive-ui'
const props = {
...modalProps,
+ memo: {
+ /**
+ *
+ * 是否记住上一次的位置
+ *
+ * @default true
+ */
+ type: Boolean,
+ default: true,
+ },
/**
*
* 是否全屏
diff --git a/src/components/RModal/src/utils.ts b/src/components/RModal/src/utils.ts
index 9fc51871..af85d9ee 100644
--- a/src/components/RModal/src/utils.ts
+++ b/src/components/RModal/src/utils.ts
@@ -1,6 +1,11 @@
import interact from 'interactjs'
import type { ModalProps } from 'naive-ui'
+import type { AnyFC } from '@/types'
+
+interface SetupDraggableOptions {
+ scheduler?: AnyFC
+}
/**
*
@@ -15,7 +20,10 @@ import type { ModalProps } from 'naive-ui'
export const setupDraggable = (
bindModal: HTMLElement,
preset: ModalProps['preset'],
+ options?: SetupDraggableOptions,
): Promise> => {
+ const { scheduler } = options ?? {}
+
return new Promise((resolve) => {
setTimeout(() => {
const allowFromStr =
@@ -35,16 +43,7 @@ export const setupDraggable = (
],
listeners: {
move: (event) => {
- const target = event.target
- const x =
- (parseFloat(target.getAttribute('data-x')) || 0) + event.dx
- const y =
- (parseFloat(target.getAttribute('data-y')) || 0) + event.dy
-
- target.style.transform = 'translate(' + x + 'px, ' + y + 'px)'
-
- target.setAttribute('data-x', x)
- target.setAttribute('data-y', y)
+ scheduler?.(event)
},
},
})
diff --git a/src/components/RQRCode/src/index.scss b/src/components/RQRCode/src/index.scss
index e447cce8..4c97667a 100644
--- a/src/components/RQRCode/src/index.scss
+++ b/src/components/RQRCode/src/index.scss
@@ -23,4 +23,8 @@
color: #ffffff;
}
}
+
+ & .n-spin-content--spinning img {
+ filter: blur(6px);
+ }
}
diff --git a/src/components/RQRCode/src/index.tsx b/src/components/RQRCode/src/index.tsx
index fcc7fcd8..fce8c31e 100644
--- a/src/components/RQRCode/src/index.tsx
+++ b/src/components/RQRCode/src/index.tsx
@@ -59,9 +59,6 @@ export default defineComponent({
const { expose } = ctx
const qrcodeURL = ref()
- const spinOverrides = {
- opacitySpinning: '0.1',
- }
let gifBuffer: GIFBuffer
let watchCallback!: WatchStopHandle
@@ -119,10 +116,12 @@ export default defineComponent({
const downloadQRCode = (fileName?: DownloadFilenameType) => {
if (qrcodeURL.value && isValueType(qrcodeURL.value, 'String')) {
- downloadAnyFile(
+ return downloadAnyFile(
qrcodeURL.value,
fileName || new Date().getTime() + '.png',
)
+ } else {
+ return Promise.reject()
}
}
@@ -151,7 +150,6 @@ export default defineComponent({
return {
qrcodeURL,
- spinOverrides,
errorActionClick,
}
},
@@ -160,7 +158,6 @@ export default defineComponent({
@@ -180,7 +177,7 @@ export default defineComponent({
this.$slots.errorAction()
) : (
<>
-
+
{{
default: () => this.errorActionDescription,
icon: () => (
diff --git a/src/components/RQRCode/src/props.ts b/src/components/RQRCode/src/props.ts
index 2bf05073..b07e3a21 100644
--- a/src/components/RQRCode/src/props.ts
+++ b/src/components/RQRCode/src/props.ts
@@ -11,7 +11,7 @@
import type { QRCodeStatus, QRCodeLevel } from './type'
import type { PropType, VNode } from 'vue'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { MaybeArray } from '@/types'
import type { Options } from 'awesome-qr'
const props = {
diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx
index 7b241be9..9ab3366a 100644
--- a/src/components/RTable/src/Table.tsx
+++ b/src/components/RTable/src/Table.tsx
@@ -22,7 +22,7 @@ import { call, renderNode, uuid } from '@/utils'
import config from './config'
import type { DropdownOption, DataTableInst } from 'naive-ui'
-import type { ComponentSize } from '@/types/modules/component'
+import type { ComponentSize } from '@/types'
import type { C as CType } from './type'
export default defineComponent({
diff --git a/src/components/RTable/src/components/C.tsx b/src/components/RTable/src/components/C.tsx
index 411f56e4..c5be73f2 100644
--- a/src/components/RTable/src/components/C.tsx
+++ b/src/components/RTable/src/components/C.tsx
@@ -27,8 +27,8 @@ import { call } from '@/utils'
import type { TreeOption, TreeDropInfo } from 'naive-ui'
import type { C } from '../type'
-import type { AnyFC } from '@/types/modules/utils'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
+import type { MaybeArray } from '@/types'
type FixedClick = (type: 'left' | 'right', option: C, index: number) => void
diff --git a/src/components/RTable/src/components/Size.tsx b/src/components/RTable/src/components/Size.tsx
index e5eb820f..96e929ca 100644
--- a/src/components/RTable/src/components/Size.tsx
+++ b/src/components/RTable/src/components/Size.tsx
@@ -16,8 +16,8 @@ import { call } from '@/utils'
import props from '../props'
import config from '../config'
-import type { ComponentSize } from '@/types/modules/component'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { ComponentSize } from '@/types'
+import type { MaybeArray } from '@/types'
export default defineComponent({
name: 'TableSizeSelect',
diff --git a/src/components/RTable/src/props.ts b/src/components/RTable/src/props.ts
index 246efbcb..01c670f7 100644
--- a/src/components/RTable/src/props.ts
+++ b/src/components/RTable/src/props.ts
@@ -12,10 +12,10 @@
import { dataTableProps } from 'naive-ui'
import type { PropType, VNode, VNodeChild } from 'vue'
-import type { MaybeArray } from '@/types/modules/utils'
+import type { MaybeArray } from '@/types'
import type { DropdownOption, DataTableColumn } from 'naive-ui'
import type { DownloadTableOptions, PrintTableOptions } from './type'
-import type { Recordable } from '@/types/modules/helper'
+import type { Recordable } from '@/types'
const props = {
...dataTableProps,
diff --git a/src/components/RTable/src/type.ts b/src/components/RTable/src/type.ts
index 6c290f93..aad5a7de 100644
--- a/src/components/RTable/src/type.ts
+++ b/src/components/RTable/src/type.ts
@@ -8,7 +8,7 @@ import type {
DataTableBaseColumn,
} from 'naive-ui'
import type { VNode } from 'vue'
-import type { Recordable } from '@/types/modules/helper'
+import type { Recordable } from '@/types'
import type { PrintDomOptions } from '@/utils'
export type TableActionIcon = string | (() => VNode)
diff --git a/src/directives/modules/debounce/index.ts b/src/directives/modules/debounce/index.ts
index 0ed01513..537dbf10 100644
--- a/src/directives/modules/debounce/index.ts
+++ b/src/directives/modules/debounce/index.ts
@@ -18,7 +18,7 @@ import { debounce } from 'lodash-es'
import { useEventListener } from '@vueuse/core'
import type { DebounceBindingOptions } from './type'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
import type { DebouncedFunc } from 'lodash-es'
import type { CustomDirectiveFC } from '@/directives/type'
diff --git a/src/directives/modules/debounce/type.ts b/src/directives/modules/debounce/type.ts
index 40a214c6..204b8234 100644
--- a/src/directives/modules/debounce/type.ts
+++ b/src/directives/modules/debounce/type.ts
@@ -1,5 +1,5 @@
import type { DebounceSettings } from 'lodash-es'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
export interface DebounceBindingOptions {
func: AnyFC
diff --git a/src/directives/modules/throttle/index.ts b/src/directives/modules/throttle/index.ts
index 86479a36..d10599ca 100644
--- a/src/directives/modules/throttle/index.ts
+++ b/src/directives/modules/throttle/index.ts
@@ -18,7 +18,7 @@ import { throttle } from 'lodash-es'
import { useEventListener } from '@vueuse/core'
import type { ThrottleBindingOptions } from './type'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
import type { DebouncedFunc } from 'lodash-es'
import type { CustomDirectiveFC } from '@/directives/type'
diff --git a/src/directives/modules/throttle/type.ts b/src/directives/modules/throttle/type.ts
index 77487d0d..134595b9 100644
--- a/src/directives/modules/throttle/type.ts
+++ b/src/directives/modules/throttle/type.ts
@@ -1,5 +1,5 @@
import type { ThrottleSettings } from 'lodash-es'
-import type { AnyFC } from '@/types/modules/utils'
+import type { AnyFC } from '@/types'
export interface ThrottleBindingOptions {
func: AnyFC
diff --git a/src/global-variable/variable.ts b/src/global-variable/variable.ts
index a29d5908..d3d1b756 100644
--- a/src/global-variable/variable.ts
+++ b/src/global-variable/variable.ts
@@ -27,11 +27,7 @@
* createVariableState({ your state })
*/
-import { ROOT_ROUTE, APP_WATERMARK_CONFIG } from '@/app-config/appConfig'
-import { cloneDeep } from 'lodash-es'
-
-import type { AnyFC } from '@/types/modules/utils'
-import type { Mutable } from '@/types/modules/helper'
+import type { AnyFC } from '@/types'
/**
*
@@ -47,7 +43,6 @@ const variableState = reactive({
globalDrawerValue: false, // 全局抽屉控制器（小尺寸设备可用）
globalMainLayoutLoad: true, // LayoutContent 区域加载控制器，会触发强制刷新
layoutContentMaximize: false, // LayoutContent 区域全屏控制器
- globalRootRoute: cloneDeep(ROOT_ROUTE), // 全局根路由配置，同步至 ROOT_ROUTE
layoutContentSpinning: false, // LayoutContent 区域加载控制器，不会触发强制刷新
})
diff --git a/src/hooks/components/useContextmenuCoordinate.ts b/src/hooks/components/useContextmenuCoordinate.ts
index d9ceba21..2713dfcc 100644
--- a/src/hooks/components/useContextmenuCoordinate.ts
+++ b/src/hooks/components/useContextmenuCoordinate.ts
@@ -11,11 +11,10 @@
import { useEventListener, onClickOutside } from '@vueuse/core'
-import type { BasicTarget } from '@/types/modules/vue'
+import type { BasicTarget } from '@/types'
import type {
MaybeElementRef,
MaybeElement,
- UseEventSourceOptions,
MaybeRefOrGetter,
} from '@vueuse/core'
diff --git a/src/hooks/template/useAppNavigation.ts b/src/hooks/template/useAppNavigation.ts
index 413762cc..afbc318f 100644
--- a/src/hooks/template/useAppNavigation.ts
+++ b/src/hooks/template/useAppNavigation.ts
@@ -11,7 +11,7 @@
import { useMenuGetters, useMenuActions } from '@/store'
-import type { AppMenuOption } from '@/types/modules/app'
+import type { AppMenuOption } from '@/types'
export type Target = number | AppMenuOption
diff --git a/src/hooks/template/useAppRoot.ts b/src/hooks/template/useAppRoot.ts
index 538e87e3..cdccca40 100644
--- a/src/hooks/template/useAppRoot.ts
+++ b/src/hooks/template/useAppRoot.ts
@@ -9,29 +9,29 @@
* @remark 今天也是元气满满撸代码的一天
*/
-import { setVariable, getVariableToRefs } from '@/global-variable'
-import { cloneDeep } from 'lodash-es'
+import { useSettingGetters, useSettingActions } from '@/store'
-import type { DeepMutable } from '@/types/modules/helper'
+import type { AppRootRoute } from '@/store/modules/setting/type'
export function useAppRoot() {
- const globalRootRoute = getVariableToRefs('globalRootRoute')
+ const { getAppRootRoute } = useSettingGetters()
+ const { updateSettingState } = useSettingActions()
/**
*
* @remark 获取根路由
*/
- const getRootRoute = computed(() => globalRootRoute.value)
+ const getRootRoute = getAppRootRoute
/**
*
* @remark 获取根路由 path
*/
- const getRootPath = computed(() => globalRootRoute.value.path)
+ const getRootPath = computed(() => getAppRootRoute.value.path)
/**
*
* @remark 获取根路由 name
*/
- const getRootName = computed(() => globalRootRoute.value.name)
+ const getRootName = computed(() => getAppRootRoute.value.name)
/**
*
@@ -42,11 +42,11 @@ export function useAppRoot() {
* @example
* setRootRoute({ path: '/your root path', name: 'your root name' })
*/
- const setRootRoute = (route: DeepMutable) => {
- const routeRef = getVariableToRefs('globalRootRoute')
- const assignRoute = Object.assign(cloneDeep(routeRef.value), route)
-
- setVariable('globalRootRoute', assignRoute)
+ const setRootRoute = (route: AppRootRoute) => {
+ updateSettingState(
+ 'appRootRoute',
+ Object.assign({}, getAppRootRoute.value, route),
+ )
}
return {
diff --git a/src/hooks/template/useSiderBar.ts b/src/hooks/template/useSiderBar.ts
index 37e2e3b1..111916da 100644
--- a/src/hooks/template/useSiderBar.ts
+++ b/src/hooks/template/useSiderBar.ts
@@ -12,7 +12,7 @@
import { useMenuGetters, useMenuActions } from '@/store'
import { redirectRouterToDashboard } from '@/router/helper/routerCopilot'
-import type { MenuTagOptions, Key } from '@/types/modules/app'
+import type { MenuTagOptions, Key } from '@/types'
export type CloseMenuTag = Key | MenuTagOptions
diff --git a/src/hooks/web/useDevice.ts b/src/hooks/web/useDevice.ts
index 905c8bbd..965c1c2f 100644
--- a/src/hooks/web/useDevice.ts
+++ b/src/hooks/web/useDevice.ts
@@ -17,6 +17,10 @@
import { useWindowSize } from '@vueuse/core'
import { watchEffectWithTarget } from '@/utils'
+import type { UseWindowSizeOptions } from '@vueuse/core'
+
+export interface UseDeviceOptions extends UseWindowSizeOptions {}
+
/**
*
* 检测当前尺寸是否为平板或者更小
@@ -28,8 +32,8 @@ import { watchEffectWithTarget } from '@/utils'
* isTabletOrSmaller.value => true // 当前尺寸为平板或者更小
* isTabletOrSmaller.value => false // 当前尺寸为桌面或者更大
*/
-export function useDevice() {
- const { width, height } = useWindowSize()
+export function useDevice(options?: UseDeviceOptions) {
+ const { width, height } = useWindowSize(options)
const isTabletOrSmaller = ref(false)
const update = () => {
diff --git a/src/hooks/web/useDomToImage.ts b/src/hooks/web/useDomToImage.ts
index f7dc076c..dcfa7d6e 100644
--- a/src/hooks/web/useDomToImage.ts
+++ b/src/hooks/web/useDomToImage.ts
@@ -13,7 +13,7 @@ import domToImage from 'dom-to-image'
import { unrefElement } from '@/utils'
import type { Options as ReDomToImageOptions } from 'dom-to-image'
-import type { BasicTarget, TargetType } from '@/types/modules/vue'
+import type { BasicTarget, TargetType } from '@/types'
export type ImageType = keyof typeof domToImageMethods
@@ -90,7 +90,8 @@ const domToImageMethods = {
* const { create, stop } = useDomToImage(refDom, {
* beforeCreate: (element) => { ... },
* created: (element, result) => { ... },
- * createdError: (element, error) => { ... },
+ * createdError: (error) => { ... },
+ * finally: () => { ... },
* })
*/
export const useDomToImage = (
@@ -102,10 +103,11 @@ export const useDomToImage = (
created,
createdError,
finally: _finally,
+ imageType: _imageType,
} = options ?? {}
const run = (
- imageType: UseDomToImageOptions['imageType'] = 'jpeg',
+ imageType?: UseDomToImageOptions['imageType'],
): Promise => {
return new Promise((resolve, reject) => {
const element = unrefElement(target)
@@ -118,10 +120,7 @@ export const useDomToImage = (
return reject('useDomToImage: element is undefined.')
}
- const type = imageType ?? options?.imageType
- const matchFc = domToImageMethods[type] || domToImageMethods['jpeg']
-
- matchFc(element, options)
+ domToImageMethods[imageType ?? _imageType ?? 'jpeg']?.(element, options)
.then((res) => {
created?.(res, element)
diff --git a/src/hooks/web/useElementFullscreen.ts b/src/hooks/web/useElementFullscreen.ts
index 03b54b81..207fe441 100644
--- a/src/hooks/web/useElementFullscreen.ts
+++ b/src/hooks/web/useElementFullscreen.ts
@@ -12,7 +12,7 @@
import { unrefElement, effectDispose, isValueType } from '@/utils'
import { useWindowSize } from '@vueuse/core'
-import type { BasicTarget } from '@/types/modules/vue'
+import type { BasicTarget } from '@/types'
export interface UseElementFullscreenOptions {
beforeEnter?: () => void
@@ -159,3 +159,7 @@ export const useElementFullscreen = (
toggleFullscreen,
}
}
+
+export type UseElementFullscreenReturnTypes = ReturnType<
+ typeof useElementFullscreen
+>
diff --git a/src/hooks/web/useI18n.ts b/src/hooks/web/useI18n.ts
index 31adab74..98193a17 100644
--- a/src/hooks/web/useI18n.ts
+++ b/src/hooks/web/useI18n.ts
@@ -18,7 +18,7 @@ const getI18nKey = (namespace: string | undefined, key: string) => {
return key
}
- if (key.startsWith(namespace)) {
+ if (key[0] === namespace) {
return key
}
diff --git a/src/hooks/web/usePrint.ts b/src/hooks/web/usePrint.ts
index 0949c670..342af3be 100644
--- a/src/hooks/web/usePrint.ts
+++ b/src/hooks/web/usePrint.ts
@@ -2,7 +2,7 @@
import print from 'print-js'
import { unrefElement } from '@/utils'
-import type { BasicTarget } from '@/types/modules/vue'
+import type { BasicTarget } from '@/types'
export interface UsePrintOptions
extends Omit {}
diff --git a/src/layout/components/Menu/index.tsx b/src/layout/components/Menu/index.tsx
index 71449cda..b363aca1 100644
--- a/src/layout/components/Menu/index.tsx
+++ b/src/layout/components/Menu/index.tsx
@@ -20,8 +20,8 @@ import { getVariableToRefs, setVariable } from '@/global-variable'
import { useMenuGetters, useMenuActions } from '@/store'
import type { MenuInst } from 'naive-ui'
-import type { NaiveMenuOptions } from '@/types/modules/component'
-import type { AppMenuOption } from '@/types/modules/app'
+import type { NaiveMenuOptions } from '@/types'
+import type { AppMenuOption } from '@/types'
export default defineComponent({
name: 'AppMenu',
diff --git a/src/layout/components/MenuTag/index.tsx b/src/layout/components/MenuTag/index.tsx
index 81050eed..c62fbaaf 100644
--- a/src/layout/components/MenuTag/index.tsx
+++ b/src/layout/components/MenuTag/index.tsx
@@ -52,7 +52,7 @@ import { throttle } from 'lodash-es'
import { useAppRoot } from '@/hooks/template'
import type { ScrollbarInst } from 'naive-ui'
-import type { MenuTagOptions, AppMenuOption } from '@/types/modules/app'
+import type { MenuTagOptions, AppMenuOption } from '@/types'
export default defineComponent({
name: 'AppMenuTag',
@@ -423,7 +423,7 @@ export default defineComponent({
}
},
render() {
- const { iconConfig, getRootPath, uuidScrollBar } = this
+ const { iconConfig, getRootPath, uuidScrollBar, getMenuTagOptions } = this
const { maximize, closeCurrentMenuTag, scrollX, $t } = this
return (
@@ -472,7 +472,7 @@ export default defineComponent({
align="center"
justify="start"
>
- {this.getMenuTagOptions.map((curr, idx) => (
+ {getMenuTagOptions.map((curr, idx) => (
+
+ 
+ 
+ 