From 89830ec7e69a7cab55e6ccf90b74377bcbadf44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=B0=8F=E6=B0=91?= Date: Mon, 4 Mar 2024 10:56:20 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20basemodal=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=80=8F=E4=BC=A0=20attributes=20=E8=87=B3=20Modal.tsx=20(#363?= =?UTF-8?q?7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Modal/src/components/Modal.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Modal/src/components/Modal.tsx b/src/components/Modal/src/components/Modal.tsx index c68e10728..cdbcd6714 100644 --- a/src/components/Modal/src/components/Modal.tsx +++ b/src/components/Modal/src/components/Modal.tsx @@ -2,7 +2,6 @@ import { Modal } from 'ant-design-vue'; import { defineComponent, toRefs, unref } from 'vue'; import { basicProps } from '../props'; import { useModalDragMove } from '../hooks/useModalDrag'; -import { useAttrs } from '@vben/hooks'; import { extendSlots } from '@/utils/helper/tsxHelper'; export default defineComponent({ @@ -10,9 +9,8 @@ export default defineComponent({ inheritAttrs: false, props: basicProps as any, emits: ['cancel'], - setup(props, { slots, emit }) { + setup(props, { slots, emit, attrs }) { const { open, draggable, destroyOnClose } = toRefs(props); - const attrs = useAttrs(); useModalDragMove({ open, destroyOnClose, From 7ec9344be8e80899749f41d173c1a11db267354e Mon Sep 17 00:00:00 2001 From: Zhong <58726932+cszhjh@users.noreply.github.com> Date: Tue, 5 Mar 2024 10:26:05 +0800 Subject: [PATCH 2/9] fix(router): resolve the next function being called twice (#3643) closed #3642 --- src/router/guard/permissionGuard.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index 9ae9d7069..472e80bd0 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -125,7 +125,6 @@ export function createPermissionGuard(router: Router) { // 指向redirect next({ path: redirect, replace: true }); } - next(); } else { // 正常访问 next(); From 9372f1d159bb3236810e469defe6986b924d2264 Mon Sep 17 00:00:00 2001 From: "Mr.Dear" <46012811+themusecatcher@users.noreply.github.com> Date: Tue, 5 Mar 2024 13:05:26 +0800 Subject: [PATCH 3/9] feat: fix ellipsis bug (#3644) --- src/components/EllipsisText/src/Tooltip.vue | 1 + vite.config.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/EllipsisText/src/Tooltip.vue b/src/components/EllipsisText/src/Tooltip.vue index 01d8ad586..02add8783 100644 --- a/src/components/EllipsisText/src/Tooltip.vue +++ b/src/components/EllipsisText/src/Tooltip.vue @@ -121,6 +121,7 @@ pointer-events: none; &::before { + content: ''; // 解决提示框箭头颜色未生效问题 position: absolute; bottom: 0; inset-inline-start: 0; diff --git a/vite.config.ts b/vite.config.ts index 428256de9..c72d42347 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -31,6 +31,7 @@ export default defineApplicationConfig({ rewrite: (path) => path.replace(new RegExp(`^/upload`), ''), }, }, + open: true, // 项目启动后，自动打开 warmup: { clientFiles: ['./index.html', './src/{views,components}/*'], }, From 32061f468c44282860681a9e884793e187cd585d Mon Sep 17 00:00:00 2001 From: codelo <39475510+codelo-99@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:23:48 +0800 Subject: [PATCH 4/9] chore: Update README.zh-CN.md (#3648) vite4, vite2 => vite5 --- README.zh-CN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.zh-CN.md b/README.zh-CN.md index 30ab63246..3123f046c 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -9,11 +9,11 @@ ## 简介 -Vue Vben Admin 是一个免费开源的中后台模版。使用了最新的`vue3`,`vite4`,`TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。 +Vue Vben Admin 是一个免费开源的中后台模版。使用了最新的`vue3`,`vite5`,`TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。 ## 特性 -- **最新技术栈**：使用 Vue3/vite2 等前端前沿技术开发 +- **最新技术栈**：使用 Vue3/vite5 等前端前沿技术开发 - **TypeScript**: 应用程序级 JavaScript 的语言 - **主题**：可配置的主题 - **国际化**：内置完善的国际化方案 From bc5e5fa015f8c5f1d69f3f8572a1957d83cfe44e Mon Sep 17 00:00:00 2001 From: Zhong <58726932+cszhjh@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:28:15 +0800 Subject: [PATCH 5/9] fix(component): resolve the issue of "vxe-table" export function not being able to be used (#3646) closed #3614 --- src/components/VxeTable/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/VxeTable/index.ts b/src/components/VxeTable/index.ts index be1212960..d64701ba8 100644 --- a/src/components/VxeTable/index.ts +++ b/src/components/VxeTable/index.ts @@ -3,10 +3,11 @@ import vxeBasicTable from './src/VxeBasicTable'; import { VXETable } from 'vxe-table'; import VXETablePluginAntd from './src/components'; import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'; +import ExcelJS from 'exceljs'; import './src/setting'; export const VxeBasicTable = withInstall(vxeBasicTable); export * from 'vxe-table'; export * from './src/types'; -VXETable.use(VXETablePluginAntd).use(VXETablePluginExportXLSX); +VXETable.use(VXETablePluginAntd).use(VXETablePluginExportXLSX, { ExcelJS }); From d42acb477c577c0f855403bff371e0780e630cdc Mon Sep 17 00:00:00 2001 From: Zhong <58726932+cszhjh@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:16:37 +0800 Subject: [PATCH 6/9] fix(component): resolve the defaultValue error in setting the date type (#3652) closed #3651 --- src/components/Form/src/BasicForm.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue index e509b6b2f..62c321b1b 100644 --- a/src/components/Form/src/BasicForm.vue +++ b/src/components/Form/src/BasicForm.vue @@ -123,7 +123,7 @@ const getBindValue = computed(() => ({ ...attrs, ...props, ...unref(getProps) }) as AntFormProps); const getSchema = computed((): FormSchema[] => { - const schemas: FormSchema[] = unref(schemaRef) || (unref(getProps).schemas as any); + const schemas: FormSchema[] = cloneDeep(unref(schemaRef) || (unref(getProps).schemas as any)); for (const schema of schemas) { const { defaultValue, @@ -163,11 +163,11 @@ } } if (unref(getProps).showAdvancedButton) { - return cloneDeep( - schemas.filter((schema) => !isIncludeSimpleComponents(schema.component)) as FormSchema[], - ); + return schemas.filter( + (schema) => !isIncludeSimpleComponents(schema.component), + ) as FormSchema[]; } else { - return cloneDeep(schemas as FormSchema[]); + return schemas as FormSchema[]; } }); From c827ffb8e680df13dae0c75b19634b6474aa5897 Mon Sep 17 00:00:00 2001 From: crudboy <965211455@qq.com> Date: Wed, 6 Mar 2024 20:31:36 +0800 Subject: [PATCH 7/9] fix(component): insertNextAt is not a function (#3656) (#3657) --- src/components/VxeTable/src/methods.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/VxeTable/src/methods.ts b/src/components/VxeTable/src/methods.ts index 491ba9fb4..4cf2cc460 100644 --- a/src/components/VxeTable/src/methods.ts +++ b/src/components/VxeTable/src/methods.ts @@ -143,6 +143,7 @@ export const gridComponentMethodKeys: ( // vxe-table-edit部分 'insert', 'insertAt', + 'insertNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', From a4cc1d53169bc26e01862ca4ff88e28d5329ab8f Mon Sep 17 00:00:00 2001 From: Caichong <951412526@qq.com> Date: Thu, 7 Mar 2024 11:32:32 +0800 Subject: [PATCH 8/9] fix: typo in locale (#3659) --- src/locales/lang/en/component.json | 4 ++-- src/locales/lang/en/layout.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/lang/en/component.json b/src/locales/lang/en/component.json index 11741189c..f8cf4f600 100644 --- a/src/locales/lang/en/component.json +++ b/src/locales/lang/en/component.json @@ -21,7 +21,7 @@ "btn_scale_y": "Flip vertical", "btn_zoom_in": "Zoom in", "btn_zoom_out": "Zoom out", - "preview": "Preivew" + "preview": "Preview" }, "drawer": { "loadingText": "Loading...", @@ -110,7 +110,7 @@ "fileName": "File name", "fileSize": "File size", "fileStatue": "File status", - "pending": "Pendig", + "pending": "Pending", "startUpload": "Start upload", "uploadSuccess": "Upload successfully", "uploadError": "Upload failed", diff --git a/src/locales/lang/en/layout.json b/src/locales/lang/en/layout.json index df2edf7a0..74612d362 100644 --- a/src/locales/lang/en/layout.json +++ b/src/locales/lang/en/layout.json @@ -72,7 +72,7 @@ "tabDetail": "Tab Detail", "tabsQuickBtn": "Tabs quick button", "tabsRedoBtn": "Tabs redo button", - "tabsFoldBtn": "Tabs flod button", + "tabsFoldBtn": "Tabs fold button", "sidebar": "Sidebar", "header": "Header", "footer": "Footer", From c7631fed681da0dd51583cf3ecba60ebfd76ec4d Mon Sep 17 00:00:00 2001 From: Zhong <58726932+cszhjh@users.noreply.github.com> Date: Thu, 7 Mar 2024 13:59:32 +0800 Subject: [PATCH 9/9] fix(router): resolve menu loading failure when permission is in "role mode" (#3660) closed #3655 --- src/router/helper/menuHelper.ts | 4 +--- src/router/menus/index.ts | 2 +- src/router/types.ts | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/router/helper/menuHelper.ts b/src/router/helper/menuHelper.ts index 6ecbccb80..4af1bad4b 100644 --- a/src/router/helper/menuHelper.ts +++ b/src/router/helper/menuHelper.ts @@ -33,9 +33,7 @@ function joinParentPath(menus: Menu[], parentPath = '') { // Parsing the menu module export function transformMenuModule(menuModule: MenuModule): Menu { - const { menu } = menuModule; - - const menuList = [menu]; + const menuList = [menuModule]; joinParentPath(menuList); return menuList[0]; diff --git a/src/router/menus/index.ts b/src/router/menus/index.ts index 58c537434..f9e6b4f0a 100644 --- a/src/router/menus/index.ts +++ b/src/router/menus/index.ts @@ -10,7 +10,7 @@ import { router } from '@/router'; import { PermissionModeEnum } from '@/enums/appEnum'; import { pathToRegexp } from 'path-to-regexp'; -const modules = import.meta.glob('./modules/**/*.ts', { eager: true }); +const modules = import.meta.glob('../routes/modules/**/*.ts', { eager: true }); const menuModules: MenuModule[] = []; diff --git a/src/router/types.ts b/src/router/types.ts index 85a2d36f7..0302212b8 100644 --- a/src/router/types.ts +++ b/src/router/types.ts @@ -51,10 +51,7 @@ export interface Menu { hideMenu?: boolean; } -export interface MenuModule { - orderNo?: number; - menu: Menu; -} +export type MenuModule = Menu; // export type AppRouteModule = RouteModule | AppRouteRecordRaw; export type AppRouteModule = AppRouteRecordRaw;