diff --git a/src/hooks/useModal.tsx b/src/hooks/useModal.tsx
deleted file mode 100644
index 7d843879f..000000000
--- a/src/hooks/useModal.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-import {
- defineComponent,
- reactive,
- createApp,
- PropType,
- getCurrentInstance,
- ComponentInternalInstance,
- isVNode,
-} from 'vue';
-import { Modal as AModal, Button } from 'ant-design-vue';
-import { isFunction } from '@/utils/is';
-
-interface ModalOptions {
- title?: string;
- footer?: null | (() => JSX.Element);
- content: ComponentInternalInstance | (() => JSX.Element);
- onConfirm?: () => void;
- onCancel?: () => void;
- props?: {
- [propName: string]: any;
- };
-}
-
-const Modal = defineComponent({
- props: {
- options: {
- type: Object as PropType
,
- default: () => ({}),
- },
- },
- setup(props) {
- const instance = getCurrentInstance()!;
-
- const state = reactive({
- options: props.options,
- visible: true,
- });
-
- const methods = {
- service: (options: ModalOptions) => {
- state.options = options;
- methods.show();
- },
- show: () => (state.visible = true),
- hide: () => (state.visible = false),
- };
-
- const handler = {
- onConfirm: async () => {
- await state.options.onConfirm?.();
- methods.hide();
- },
- onCancel: () => {
- state.options.onCancel?.();
- methods.hide();
- },
- };
-
- Object.assign(instance.proxy, methods);
-
- return () => (
-
- {{
- default: () =>
- isVNode(state.options.content) ? (
-
- ) : isFunction(state.options.content) ? (
- state.options.content()
- ) : null,
- footer: () =>
- state.options.footer === null ? null : (
-
-
-
-
- ),
- }}
-
- );
- },
-});
-
-export const useModal = (() => {
- let instance: any;
- return (options: ModalOptions) => {
- if (instance) {
- instance.service(options);
- return instance;
- }
- const div = document.createElement('div');
- document.body.appendChild(div);
- const app = createApp(Modal, { options });
- instance = app.mount(div);
- return instance;
- };
-})();
diff --git a/src/router/generator-router.tsx b/src/router/generator-router.tsx
index 50ebd16a6..d12f7add5 100644
--- a/src/router/generator-router.tsx
+++ b/src/router/generator-router.tsx
@@ -69,10 +69,12 @@ export function filterAsyncRoute(
// 如果是页面
const Component = constantRouterComponents[viewPath] || NotFound;
route.component = Component;
- const perms = routes.filter((n) => n.parentId === item.id).map((n) => n.perms?.split(','));
+ const perms = routes
+ .filter((n) => n.parentId === item.id)
+ .flatMap((n) => n.perms?.split(','));
if (route.meta && perms) {
// 设置当前页面所拥有的权限
- route.meta.perms = perms.flat(Infinity) as string[];
+ route.meta.perms = perms;
}
return route;
}
diff --git a/src/views/shared/demos/custom-modal.vue b/src/views/shared/demos/custom-modal.vue
index c3dfb55fc..3e7dd5c71 100644
--- a/src/views/shared/demos/custom-modal.vue
+++ b/src/views/shared/demos/custom-modal.vue
@@ -8,7 +8,10 @@
style="margin-bottom: 12px"
/>
- 弹出弹窗
+
+ 弹出弹窗
+ 函数式调用弹窗
+
@@ -16,15 +19,26 @@
+
+