diff --git a/src/components/Upload/src/UploadModal.vue b/src/components/Upload/src/UploadModal.vue index 18008421705486ea229a765a1676c170fa094c5c..fe399692bd9f61daf4af7ebb9d2a686b31e791e7 100644 --- a/src/components/Upload/src/UploadModal.vue +++ b/src/components/Upload/src/UploadModal.vue @@ -64,7 +64,7 @@ export default defineComponent({ components: { BasicModal, Upload, Alert, FileList }, props: basicProps, - emits: ['change'], + emits: ['change', 'register'], setup(props, { emit }) { const { t } = useI18n(); diff --git a/src/components/Upload/src/UploadPreviewModal.vue b/src/components/Upload/src/UploadPreviewModal.vue index 88b1b294731f0bb37692e839d6604b1e0cf586c8..0cfc12674c7081fad841e87afdc7b654f7b32ee4 100644 --- a/src/components/Upload/src/UploadPreviewModal.vue +++ b/src/components/Upload/src/UploadPreviewModal.vue @@ -27,7 +27,7 @@ export default defineComponent({ components: { BasicModal, FileList }, props: previewProps, - emits: ['list-change'], + emits: ['list-change', 'register'], setup(props, { emit }) { const [register, { closeModal }] = useModalInner(); const { t } = useI18n(); diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index d9545be9cc76a2cc7784ac00f02be131790ce0a2..3380f432b907524075754662661368baa6821ded 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -1,8 +1,8 @@ // button重置 .ant-btn { - display: inline-flex; - justify-content: center; - align-items: center; + // display: inline-flex; + // justify-content: center; + // align-items: center; // &.ant-btn-success:not(.ant-btn-link), // &.ant-btn-error:not(.ant-btn-link), // &.ant-btn-warning:not(.ant-btn-link), diff --git a/src/layouts/default/menu/index.tsx b/src/layouts/default/menu/index.tsx index e1f07949d908aa71e5a60185589c433f85a9c9a4..f0a2817d977913976e1700f383683976d939fb48 100644 --- a/src/layouts/default/menu/index.tsx +++ b/src/layouts/default/menu/index.tsx @@ -128,6 +128,7 @@ export default defineComponent({ function renderMenu() { const menus = unref(menusRef); + // console.log(menus); if (!menus || !menus.length) return null; return !props.isHorizontal ? ( { - // router.addRoute(RootRoute.name!, route as RouteRecordRaw); router.addRoute(route as RouteRecordRaw); }); diff --git a/src/router/menus/index.ts b/src/router/menus/index.ts index 5d12e8b0b768ad8a3c76f4471d6b35f422130510..940c4f1e9724031580d2e9979a405bf1d3c78ed0 100644 --- a/src/router/menus/index.ts +++ b/src/router/menus/index.ts @@ -64,7 +64,6 @@ export async function getCurrentParentPath(currentPath: string) { export async function getShallowMenus(): Promise { const menus = await getAsyncMenus(); const routes = router.getRoutes(); - const shallowMenuList = menus.map((item) => ({ ...item, children: undefined })); return !isBackMode() ? shallowMenuList.filter(basicFilter(routes)) : shallowMenuList; } diff --git a/src/views/demo/comp/upload/index.vue b/src/views/demo/comp/upload/index.vue index d7ee62c4f81e2d0f0e9ee63d1604bbaae634a17d..94025ee00613a3d4cdbbee8639d57b6cc51936a8 100644 --- a/src/views/demo/comp/upload/index.vue +++ b/src/views/demo/comp/upload/index.vue @@ -1,11 +1,17 @@