Pre Merge pull request !8 from xia520/hr

This commit is contained in:
xia520 2024-11-01 03:24:40 +00:00 committed by Gitee
commit f1ea6f6362
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
31 changed files with 33 additions and 25 deletions

View File

@ -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

View File

@ -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参数才能使用

View File

@ -45,5 +45,9 @@ export const overridesPreferences = defineOverridesPreferences({
* sidebar
*/
semiDarkSidebar: false,
radius: '0.25',
},
breadcrumb: {
styleType: 'background',
},
});

View File

@ -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页面

View File

@ -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"
>
<template #third-party-login>
<OAuthLogin />
</template>
</AuthenticationLogin>
/>
</template>

0
apps/web-antd/src/views/demo/demo/api/index.ts Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/demo/api/model.d.ts vendored Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/demo/data.ts Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/demo/demo-modal.vue Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/tree/api/index.ts Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/tree/api/model.d.ts vendored Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/tree/data.ts Executable file → Normal file
View File

0
apps/web-antd/src/views/demo/tree/tree-modal.vue Executable file → Normal file
View File

View File

@ -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',
};

View File

@ -27,6 +27,7 @@ const [BasicForm, formApi] = useVbenForm({
const [BasicModal, modalApi] = useVbenModal({
fullscreenButton: false,
draggable: true,
onCancel: handleCancel,
onConfirm: handleConfirm,
onOpenChange: async (isOpen) => {

View File

@ -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',
};

View File

@ -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',
};

View File

@ -8,7 +8,7 @@ import DictTypePanel from './type/index.vue';
<template>
<Page
:auto-content-height="true"
content-class="flex flex-col lg:flex-row gap-4"
content-class="flex flex-col lg:flex-row gap-2"
>
<DictTypePanel class="flex-1 overflow-hidden" />
<DictDataPanel class="flex-1 overflow-hidden" />

View File

@ -44,6 +44,7 @@ const formOptions: VbenFormProps = {
allowClear: true,
},
},
showCollapseButton: false,
schema: querySchema(),
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3',
};

View File

@ -32,6 +32,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',
};

View File

@ -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',
};

View File

@ -40,6 +40,7 @@ const formOptions: VbenFormProps = {
allowClear: true,
},
},
collapsed: true,
schema: querySchema(),
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
};

View File

@ -30,6 +30,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',
handleReset: async () => {

View File

@ -48,6 +48,7 @@ const formOptions: VbenFormProps = {
allowClear: true,
},
},
collapsed: true,
schema: querySchema(),
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
};

View File

@ -26,7 +26,6 @@ const [BasicForm, formApi] = useVbenForm({
},
formItemClass: 'col-span-2',
},
layout: 'vertical',
schema: drawerSchema(),
showDefaultActions: false,
wrapperClass: 'grid-cols-2',

View File

@ -37,6 +37,7 @@ const formOptions: VbenFormProps = {
allowClear: true,
},
},
collapsed: true,
schema: querySchema(),
wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
};

View File

@ -61,6 +61,7 @@ function handleImport() {
const selectDeptId = ref<string[]>([]);
const formOptions: VbenFormProps = {
collapsed: true,
schema: querySchema(),
commonConfig: {
labelWidth: 80,

View File

@ -213,12 +213,6 @@ function handleImport() {
<Page :auto-content-height="true">
<BasicTable table-title="代码生成列表">
<template #toolbar-tools>
<a
class="text-primary mr-2"
href="https://dapdap.top/other/template.html"
target="_blank"
>👉关于代码生成模板
</a>
<Space>
<a-button
:disabled="!checked"

View File

@ -243,7 +243,7 @@ const defaultPreferences: Preferences = {
colorSuccess: 'hsl(144 57% 58%)',
colorWarning: 'hsl(42 84% 61%)',
mode: 'dark',
radius: '0.5',
radius: '0.25',
semiDarkHeader: false,
semiDarkSidebar: true,
},

View File

@ -37,5 +37,8 @@
"default": "./dist/index.mjs"
}
}
},
"dependencies": {
"@vben-core/design": "file:"
}
}

View File

@ -69,7 +69,7 @@ onMounted(() => {
$slots.extra
"
ref="headerRef"
class="bg-card relative px-6 py-4"
class="bg-card relative px-4 py-2"
>
<slot name="title">
<div v-if="title" class="mb-2 flex text-lg font-semibold">
@ -83,19 +83,19 @@ onMounted(() => {
</p>
</slot>
<div v-if="$slots.extra" class="absolute bottom-4 right-4">
<div v-if="$slots.extra" class="absolute bottom-2 right-2">
<slot name="extra"></slot>
</div>
</div>
<div :class="contentClass" :style="contentStyle" class="h-full p-4">
<div :class="contentClass" :style="contentStyle" class="h-full p-2">
<slot></slot>
</div>
<div
v-if="$slots.footer"
ref="footerRef"
class="bg-card align-center absolute bottom-0 left-0 right-0 flex px-6 py-4"
class="bg-card align-center absolute bottom-0 left-0 right-0 flex px-4 py-2"
>
<slot name="footer"></slot>
</div>