diff --git a/apps/web-antd/.env b/apps/web-antd/.env index 2c7c63cac8bc8c12570d129a70b10f38c4a8fff8..71c86e4414fc3b6e37d0cb0a51560e1f42f3e529 100644 --- a/apps/web-antd/.env +++ b/apps/web-antd/.env @@ -1,5 +1,5 @@ # 应用标题 -VITE_APP_TITLE=Plus Admin +VITE_APP_TITLE=特能博世人力资源管理系统 # 应用命名空间，用于缓存、store等功能的前缀，确保隔离 -VITE_APP_NAMESPACE=vben-web-antd +VITE_APP_NAMESPACE=vben-web-antd-hr diff --git a/apps/web-antd/src/adapter/vxe-table.ts b/apps/web-antd/src/adapter/vxe-table.ts index 518f27d9eefbf30c6236dfd35354facc5db0d795..eeef8e1836f3c0ea96835d3b73a32d1903002c0b 100644 --- a/apps/web-antd/src/adapter/vxe-table.ts +++ b/apps/web-antd/src/adapter/vxe-table.ts @@ -31,7 +31,7 @@ setupVbenVxeTable({ showOverflow: true, pagerConfig: { // 默认条数 - pageSize: 10, + pageSize: 20, // 分页可选条数 pageSizes: [10, 20, 30, 40, 50], }, @@ -62,7 +62,7 @@ setupVbenVxeTable({ // 圆角按钮 round: true, // 表格尺寸 - size: 'medium', + size: 'mini', customConfig: { // 表格右上角自定义列配置 是否保存到localStorage // 必须存在id参数才能使用 diff --git a/apps/web-antd/src/preferences.ts b/apps/web-antd/src/preferences.ts index 16d86d7ee3b3b59466b59363f3464a079107fd1c..7f2376ce613df885af422292f1756adaf1cf8fa0 100644 --- a/apps/web-antd/src/preferences.ts +++ b/apps/web-antd/src/preferences.ts @@ -45,5 +45,9 @@ export const overridesPreferences = defineOverridesPreferences({ * 浅色sidebar */ semiDarkSidebar: false, + radius: '0.25', + }, + breadcrumb: { + styleType: 'background', }, }); diff --git a/apps/web-antd/src/router/access.ts b/apps/web-antd/src/router/access.ts index 6990ba8b2ffc593da1ea2cebe53aedf40845a651..0921b8df95b5bc914ca733d93b7fedf80ea2f1f9 100644 --- a/apps/web-antd/src/router/access.ts +++ b/apps/web-antd/src/router/access.ts @@ -207,7 +207,6 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) { const vbenMenuList = backMenuToVbenMenu(backMenuList); // 特别注意 这里要深拷贝 const menuList = [...cloneDeep(localMenuList), ...vbenMenuList]; - console.log('menuList', menuList); return menuList; }, // 可以指定没有权限跳转403页面 diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue index 8dffd3f1f3e17334c69ebc9bfe05996f2b9f4e72..985e1a4306779ba7907405ae809f82760f8c057f 100644 --- a/apps/web-antd/src/views/_core/authentication/login.vue +++ b/apps/web-antd/src/views/_core/authentication/login.vue @@ -12,8 +12,6 @@ import { tenantList, type TenantResp } from '#/api'; import { captchaImage, type CaptchaResponse } from '#/api/core/captcha'; import { useAuthStore } from '#/store'; -import OAuthLogin from './oauth-login.vue'; - defineOptions({ name: 'Login' }); const authStore = useAuthStore(); @@ -152,11 +150,10 @@ async function handleAccountLogin(values: LoginAndRegisterParams) { ref="loginFormRef" :form-schema="formSchema" :loading="authStore.loginLoading" + :show-code-login="false" + :show-qrcode-login="false" :show-register="false" + :show-third-party-login="false" @submit="handleAccountLogin" - > - - + /> diff --git a/apps/web-antd/src/views/demo/demo/api/index.ts b/apps/web-antd/src/views/demo/demo/api/index.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/demo/api/model.d.ts b/apps/web-antd/src/views/demo/demo/api/model.d.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/demo/data.ts b/apps/web-antd/src/views/demo/demo/data.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/demo/demo-modal.vue b/apps/web-antd/src/views/demo/demo/demo-modal.vue old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/tree/api/index.ts b/apps/web-antd/src/views/demo/tree/api/index.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/tree/api/model.d.ts b/apps/web-antd/src/views/demo/tree/api/model.d.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/tree/data.ts b/apps/web-antd/src/views/demo/tree/data.ts old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/demo/tree/tree-modal.vue b/apps/web-antd/src/views/demo/tree/tree-modal.vue old mode 100755 new mode 100644 diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue index 8ff96d4248e6b5d442ebfbdac9164db571fb4931..55e1bc291e481575062389a9677e697245804ee3 100644 --- a/apps/web-antd/src/views/system/client/index.vue +++ b/apps/web-antd/src/views/system/client/index.vue @@ -33,6 +33,7 @@ const formOptions: VbenFormProps = { allowClear: true, }, }, + showCollapseButton: false, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', }; diff --git a/apps/web-antd/src/views/system/config/config-modal.vue b/apps/web-antd/src/views/system/config/config-modal.vue index 9569f0c5861e22973aa49748758e68b767d7915a..7e3f7af8aae4e0426bdc836944c5f869da82e3d7 100644 --- a/apps/web-antd/src/views/system/config/config-modal.vue +++ b/apps/web-antd/src/views/system/config/config-modal.vue @@ -27,6 +27,7 @@ const [BasicForm, formApi] = useVbenForm({ const [BasicModal, modalApi] = useVbenModal({ fullscreenButton: false, + draggable: true, onCancel: handleCancel, onConfirm: handleConfirm, onOpenChange: async (isOpen) => { diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index 94aa5ac988d53b58a325b8f59d1ed75c783f2c62..34e58b0d95438adb9c9e51543396af67006ec58e 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -26,6 +26,7 @@ const formOptions: VbenFormProps = { allowClear: true, }, }, + showCollapseButton: false, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4', }; diff --git a/apps/web-antd/src/views/system/dict/data/index.vue b/apps/web-antd/src/views/system/dict/data/index.vue index e2d0c48e210864e3ebcc4512999ea872ace74771..88fff428737f930536e3005308c322c13ca72d2c 100644 --- a/apps/web-antd/src/views/system/dict/data/index.vue +++ b/apps/web-antd/src/views/system/dict/data/index.vue @@ -34,6 +34,7 @@ const formOptions: VbenFormProps = { allowClear: true, }, }, + showCollapseButton: false, schema: querySchema(), wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3', }; diff --git a/apps/web-antd/src/views/system/dict/index.vue b/apps/web-antd/src/views/system/dict/index.vue index c98d347a40a9c876d8874b8eb31c247a748dc1df..94ba1cdc3125c23337859b7bd4c2b51d30819ce8 100644 --- a/apps/web-antd/src/views/system/dict/index.vue +++ b/apps/web-antd/src/views/system/dict/index.vue @@ -8,7 +8,7 @@ import DictTypePanel from './type/index.vue';