diff --git a/src/app-components/app/RayLink/index.tsx b/src/app-components/app/RayLink/index.tsx
index 0f7f6015..908e38ec 100644
--- a/src/app-components/app/RayLink/index.tsx
+++ b/src/app-components/app/RayLink/index.tsx
@@ -1,4 +1,9 @@
-import { NAvatar, NTooltip, NSpace } from 'naive-ui'
+/**
+ *
+ * 友情链接组件，无实际项目意义
+ */
+
+import { NAvatar, NTooltip, NFlex } from 'naive-ui'
interface AvatarOptions {
key: string
@@ -7,7 +12,7 @@ interface AvatarOptions {
icon: string
}
-const RayLink = defineComponent({
+export default defineComponent({
name: 'RayLink',
setup() {
const avatarOptions: AvatarOptions[] = [
@@ -60,7 +65,7 @@ const RayLink = defineComponent({
},
render() {
return (
-
+
{this.avatarOptions.map((curr) => (
{{
@@ -80,16 +85,7 @@ const RayLink = defineComponent({
}}
))}
-
+
)
},
})
-
-export default RayLink
-
-/**
- *
- * 友链组件
- *
- * 这个组件用作初试模板中, 不喜欢自行删除
- */
diff --git a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx
index ca14fd54..f7e41203 100644
--- a/src/app-components/provider/AppNaiveGlobalProvider/index.tsx
+++ b/src/app-components/provider/AppNaiveGlobalProvider/index.tsx
@@ -43,20 +43,29 @@ export default defineComponent({
return naiveLocales(key)
})
- const { message, notification, dialog, loadingBar } = createDiscreteApi(
- ['message', 'dialog', 'notification', 'loadingBar'],
- {
- configProviderProps: computed(() => ({
- theme: getAppTheme.value ? darkTheme : null,
- })),
- notificationProviderProps: {},
- },
- )
+ /**
+ *
+ * 使用 createDiscreteApi 脱离上下文 api 注入一些常用的组件
+ * 通过 window.$message、window.$notification、window.$dialog、window.$loadingBar 访问
+ * 但是，使用该组件注册后，使用 window.$notification 组件时不能更改 placement 位置（只能默认右上角弹出）
+ *
+ * 改为函数包裹，避免 `slot default invoked outside of render` 警告
+ */
+ const discreteApi = () => {
+ const { message, notification, dialog, loadingBar } = createDiscreteApi(
+ ['message', 'dialog', 'notification', 'loadingBar'],
+ {
+ configProviderProps: computed(() => ({
+ theme: getAppTheme.value ? darkTheme : null,
+ })),
+ },
+ )
- window.$dialog = dialog // 注入 `dialog`
- window.$message = message // 注入 `message`
- window.$loadingBar = loadingBar // 注入 `loadingBar`
- window.$notification = notification // 注入 `notification`
+ window.$dialog = dialog // 注入 `dialog`
+ window.$message = message // 注入 `message`
+ window.$loadingBar = loadingBar // 注入 `loadingBar`
+ window.$notification = notification // 注入 `notification`
+ }
expose()
@@ -64,22 +73,30 @@ export default defineComponent({
getPrimaryColorOverride,
localePackage,
getAppTheme,
+ discreteApi,
}
},
render() {
+ const {
+ $slots: { default: slotDefault },
+ discreteApi,
+ } = this
+ const { getPrimaryColorOverride, getAppTheme, localePackage } = this
+
return (
- {this.$slots.default?.()}
+ {slotDefault?.()}
+ {discreteApi()}
diff --git a/src/app-config/appConfig.ts b/src/app-config/appConfig.ts
index 8411abaa..7074a594 100644
--- a/src/app-config/appConfig.ts
+++ b/src/app-config/appConfig.ts
@@ -86,9 +86,11 @@ export const APP_MENU_CONFIG: Readonly = {
* - signing: 登陆信息缓存 key
* - localeLanguage: 国际化默认缓存 key
* - token: token key
+ * - appMenuKey: 菜单缓存 key
*/
export const APP_CATCH_KEY = {
signing: 'signing',
localeLanguage: 'localeLanguage',
token: 'token',
+ appMenuKey: 'menuKey',
} as const
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
new file mode 100644
index 00000000..33f42cdf
--- /dev/null
+++ b/src/app-config/index.ts
@@ -0,0 +1,6 @@
+export * from './appConfig'
+export * from './designConfig'
+export * from './localConfig'
+export * from './regexConfig'
+export * from './requestConfig'
+export * from './routerConfig'
diff --git a/src/axios/inject/request/provider.ts b/src/axios/inject/request/provider.ts
index 11f37547..1462795b 100644
--- a/src/axios/inject/request/provider.ts
+++ b/src/axios/inject/request/provider.ts
@@ -22,7 +22,7 @@
import { axiosCanceler } from '@/axios/helper/interceptor'
import { appendRequestHeaders } from '@/axios/helper/axiosCopilot'
-import { APP_CATCH_KEY } from '@/app-config/appConfig'
+import { APP_CATCH_KEY } from '@/app-config'
import { getStorage } from '@/utils'
import type {
diff --git a/src/axios/instance.ts b/src/axios/instance.ts
index 54695935..795a6f31 100644
--- a/src/axios/instance.ts
+++ b/src/axios/instance.ts
@@ -17,7 +17,7 @@
*/
import axios from 'axios'
-import { AXIOS_CONFIG } from '@/app-config/requestConfig'
+import { AXIOS_CONFIG } from '@/app-config'
import { useAxiosInterceptor } from '@/axios/helper/interceptor'
import {
setupResponseInterceptor,
diff --git a/src/components/RChart/src/index.tsx b/src/components/RChart/src/index.tsx
index 99ee4044..5499c7f0 100644
--- a/src/components/RChart/src/index.tsx
+++ b/src/components/RChart/src/index.tsx
@@ -43,7 +43,7 @@ import props from './props'
import { throttle } from 'lodash-es'
import { completeSize, downloadBase64File, call, renderNode } from '@/utils'
import { setupChartTheme } from './helper'
-import { APP_THEME } from '@/app-config/designConfig'
+import { APP_THEME } from '@/app-config'
import { useResizeObserver } from '@vueuse/core'
import { RMoreDropdown } from '@/components'
import { useSettingGetters } from '@/store'
diff --git a/src/components/RChart/src/type.ts b/src/components/RChart/src/type.ts
index 682454b9..ad3117c1 100644
--- a/src/components/RChart/src/type.ts
+++ b/src/components/RChart/src/type.ts
@@ -75,6 +75,13 @@ export interface RChartInst {
* @default () => void
*/
render: () => void
+ /**
+ *
+ * 判断图表是否已经卸载
+ *
+ * @returns 图表是否已经卸载
+ */
+ isDispose: () => boolean
}
export type EChartsExtensionInstallRegisters = typeof CanvasRenderer
diff --git a/src/components/RCollapseGrid/src/index.tsx b/src/components/RCollapseGrid/src/index.tsx
index 9c4babe1..6b3f4244 100644
--- a/src/components/RCollapseGrid/src/index.tsx
+++ b/src/components/RCollapseGrid/src/index.tsx
@@ -21,7 +21,7 @@
import './index.scss'
-import { NCard, NGrid, NGridItem, NSpace } from 'naive-ui'
+import { NCard, NGrid, NGridItem, NFlex } from 'naive-ui'
import { RIcon } from '@/components'
import { call } from '@/utils'
@@ -85,10 +85,10 @@ export default defineComponent({
>
{this.$slots.default?.()}
-
+
{this.$slots.action?.()}
{this.CollapseIcon()}
-
+
),
diff --git a/src/components/RTable/src/Table.tsx b/src/components/RTable/src/Table.tsx
index 9ab3366a..6f947985 100644
--- a/src/components/RTable/src/Table.tsx
+++ b/src/components/RTable/src/Table.tsx
@@ -11,7 +11,7 @@
import './index.scss'
-import { NCard, NDataTable, NDropdown, NSpace } from 'naive-ui'
+import { NCard, NDataTable, NDropdown, NFlex } from 'naive-ui'
import Size from './components/Size'
import Fullscreen from './components/Fullscreen'
import C from './components/C'
@@ -238,10 +238,10 @@ export default defineComponent({
defaultElement: ,
}),
'header-extra': () => (
-
+
{/* eslint-disable @typescript-eslint/no-explicit-any */}
{tool(this.$props as any)}
-
+
),
footer: () => this.$slots.tableFooter?.(),
action: () => this.$slots.tableAction?.(),
diff --git a/src/components/RTable/src/components/C.tsx b/src/components/RTable/src/components/C.tsx
index c5be73f2..a2962afe 100644
--- a/src/components/RTable/src/components/C.tsx
+++ b/src/components/RTable/src/components/C.tsx
@@ -18,7 +18,7 @@
* 2. 大量数据的时候，可能会出现性能问题
*/
-import { NPopover, NSpace, NTree } from 'naive-ui'
+import { NPopover, NFlex, NTree } from 'naive-ui'
import { RIcon } from '@/components'
import config from '../config'
@@ -65,6 +65,13 @@ const RowIconRender = ({
)
}
+/**
+ * 查找节点的兄弟节点和索引
+ *
+ * @param node 要查找的节点
+ * @param nodes 节点列表
+ * @returns 如果找到节点，则返回包含兄弟节点列表和索引的元组，否则返回 [null, null]
+ */
const findSiblingsAndIndex = (
node: TreeOption,
nodes?: TreeOption[],
@@ -122,7 +129,7 @@ export default defineComponent({
return {
...attr,
suffix: () => (
-
+
-
+
),
}
}) as C[]
@@ -192,6 +199,7 @@ export default defineComponent({
event(treeDataSource.value)
}
+ // 拖拽节点的处理函数
const treeDrop = ({ node, dragNode, dropPosition }: TreeDropInfo) => {
const [dragNodeSiblings, dragNodeIndex] = findSiblingsAndIndex(
dragNode,
@@ -202,6 +210,7 @@ export default defineComponent({
return
}
+ // 从兄弟节点中移除拖拽节点
dragNodeSiblings.splice(dragNodeIndex, 1)
const [nodeSiblings, nodeIndex] = findSiblingsAndIndex(
@@ -213,10 +222,12 @@ export default defineComponent({
return
}
+ // 根据拖拽位置将拖拽节点插入到目标节点的前面或后面
dropPosition === 'before'
? nodeSiblings.splice(nodeIndex, 0, dragNode)
: nodeSiblings.splice(nodeIndex + 1, 0, dragNode)
+ // 触发事件，更新树形数据源
event(nodeSiblings as C[])
}
diff --git a/src/components/RTransitionComponent/src/index.vue b/src/components/RTransitionComponent/src/index.vue
index 9f1c9b30..6fcb71ce 100644
--- a/src/components/RTransitionComponent/src/index.vue
+++ b/src/components/RTransitionComponent/src/index.vue
@@ -24,7 +24,7 @@