chore: 默认值

This commit is contained in:
dap 2024-10-06 09:53:00 +08:00
parent da4c612481
commit 60ae7cc0cc
15 changed files with 103 additions and 100 deletions

View File

@ -1,6 +1,6 @@
import type { Dept } from './model'; import type { Dept } from './model';
import type { ID, PageQuery } from '#/api/common'; import type { ID } from '#/api/common';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -10,7 +10,7 @@ enum Api {
root = '/system/dept', root = '/system/dept',
} }
export function deptList(params?: PageQuery) { export function deptList(params?: any) {
return requestClient.get<Dept[]>(Api.deptList, { params }); return requestClient.get<Dept[]>(Api.deptList, { params });
} }

View File

@ -1,6 +1,6 @@
import type { Menu, MenuOption, MenuResp } from './model'; import type { Menu, MenuOption, MenuResp } from './model';
import type { ID, IDS, PageQuery } from '#/api/common'; import type { ID, IDS } from '#/api/common';
import { requestClient } from '#/api/request'; import { requestClient } from '#/api/request';
@ -12,7 +12,7 @@ enum Api {
tenantPackageMenuTreeselect = '/system/menu/tenantPackageMenuTreeselect', tenantPackageMenuTreeselect = '/system/menu/tenantPackageMenuTreeselect',
} }
export function menuList(params?: PageQuery) { export function menuList(params?: any) {
return requestClient.get<Menu[]>(Api.menuList, { params }); return requestClient.get<Menu[]>(Api.menuList, { params });
} }

View File

@ -44,7 +44,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
return await loginInfoList({ return await loginInfoList({
pageNum: page.currentPage, pageNum: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,
@ -147,7 +147,7 @@ async function handleUnlock() {
:disabled="!checked" :disabled="!checked"
danger danger
type="primary" type="primary"
v-access:code="['monitor:logininfor:delete']" v-access:code="['monitor:logininfor:remove']"
@click="handleMultiDelete" @click="handleMultiDelete"
> >
{{ $t('pages.common.delete') }} {{ $t('pages.common.delete') }}
@ -158,20 +158,24 @@ async function handleUnlock() {
</Space> </Space>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<Space> <a-button size="small" type="link" @click.stop="handlePreview(row)">
<a-button size="small" type="link" @click.stop="handlePreview(row)"> {{ $t('pages.common.info') }}
{{ $t('pages.common.info') }} </a-button>
</a-button> <Popconfirm
<Popconfirm placement="left"
placement="left" title="确认删除?"
title="确认删除?" @confirm="() => handleDelete(row)"
@confirm="() => handleDelete(row)" >
<a-button
danger
size="small"
type="link"
v-access:code="['monitor:logininfor:remove']"
@click.stop=""
> >
<a-button danger size="small" type="link" @click.stop=""> 删除
删除 </a-button>
</a-button> </Popconfirm>
</Popconfirm>
</Space>
</template> </template>
</BasicTable> </BasicTable>
<LoginInfoModal /> <LoginInfoModal />

View File

@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
return await clientList({ return await clientList({
pageNum: page.currentPage, pageNum: page.currentPage,
pageSize: page.pageSize, pageSize: page.pageSize,

View File

@ -43,7 +43,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {
@ -105,7 +105,7 @@ async function handleEdit(record: Recordable<any>) {
async function handleDelete(row: Recordable<any>) { async function handleDelete(row: Recordable<any>) {
await configRemove(row.configId); await configRemove(row.configId);
await tableApi.reload(); await tableApi.query();
} }
function handleMultiDelete() { function handleMultiDelete() {
@ -117,14 +117,14 @@ function handleMultiDelete() {
content: `确认删除选中的${ids.length}条记录吗?`, content: `确认删除选中的${ids.length}条记录吗?`,
onOk: async () => { onOk: async () => {
await configRemove(ids); await configRemove(ids);
await tableApi.reload(); await tableApi.query();
}, },
}); });
} }
async function handleRefreshCache() { async function handleRefreshCache() {
await configRefreshCache(); await configRefreshCache();
await tableApi.reload(); await tableApi.query();
} }
</script> </script>
@ -187,6 +187,6 @@ async function handleRefreshCache() {
</Popconfirm> </Popconfirm>
</template> </template>
</BasicTable> </BasicTable>
<ConfigModal @reload="tableApi.reload()" /> <ConfigModal @reload="tableApi.query()" />
</Page> </Page>
</template> </template>

View File

@ -117,13 +117,18 @@ export const drawerSchema: FormSchemaGetter = () => [
rules: z rules: z
.string() .string()
.regex(/^1[3,4578]\d{9}$/, { message: '请输入正确的手机号' }) .regex(/^1[3,4578]\d{9}$/, { message: '请输入正确的手机号' })
.optional(), .optional()
.or(z.literal('')),
}, },
{ {
component: 'Input', component: 'Input',
fieldName: 'email', fieldName: 'email',
label: '邮箱', label: '邮箱',
rules: z.string().email({ message: '请输入正确的邮箱' }).optional(), rules: z
.string()
.email({ message: '请输入正确的邮箱' })
.optional()
.or(z.literal('')),
}, },
{ {
component: 'RadioGroup', component: 'RadioGroup',

View File

@ -31,7 +31,7 @@ const gridOptions: VxeGridProps = {
}, },
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async (_, formValues) => { query: async (_, formValues = {}) => {
const resp = await deptList({ const resp = await deptList({
...formValues, ...formValues,
}); });
@ -117,31 +117,29 @@ function collapseAll() {
</Space> </Space>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<Space> <a-button
size="small"
type="link"
v-access:code="['system:dept:edit']"
@click="handleEdit(row)"
>
{{ $t('pages.common.edit') }}
</a-button>
<Popconfirm
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button <a-button
danger
size="small" size="small"
type="link" type="link"
v-access:code="['system:dept:edit']" v-access:code="['system:dept:remove']"
@click="handleEdit(row)" @click.stop=""
> >
{{ $t('pages.common.edit') }} {{ $t('pages.common.delete') }}
</a-button> </a-button>
<Popconfirm </Popconfirm>
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button
danger
size="small"
type="link"
v-access:code="['system:dept:remove']"
@click.stop=""
>
{{ $t('pages.common.delete') }}
</a-button>
</Popconfirm>
</Space>
</template> </template>
</BasicTable> </BasicTable>
<DeptDrawer @reload="tableApi.query()" /> <DeptDrawer @reload="tableApi.query()" />

View File

@ -29,7 +29,7 @@ const gridOptions: VxeGridProps = {
}, },
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async (_, formValues) => { query: async (_, formValues = {}) => {
const resp = await menuList({ const resp = await menuList({
...formValues, ...formValues,
}); });
@ -109,31 +109,29 @@ function collapseAll() {
</Space> </Space>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<Space> <a-button
size="small"
type="link"
v-access:code="['system:menu:edit']"
@click="handleEdit(row)"
>
{{ $t('pages.common.edit') }}
</a-button>
<Popconfirm
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button <a-button
danger
size="small" size="small"
type="link" type="link"
v-access:code="['system:menu:edit']" v-access:code="['system:menu:remove']"
@click="handleEdit(row)" @click.stop=""
> >
{{ $t('pages.common.edit') }} {{ $t('pages.common.delete') }}
</a-button> </a-button>
<Popconfirm </Popconfirm>
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button
danger
size="small"
type="link"
v-access:code="['system:menu:delete']"
@click.stop=""
>
{{ $t('pages.common.delete') }}
</a-button>
</Popconfirm>
</Space>
</template> </template>
</BasicTable> </BasicTable>
<MenuDrawer @reload="tableApi.query()" /> <MenuDrawer @reload="tableApi.query()" />

View File

@ -37,7 +37,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {
@ -100,7 +100,7 @@ async function handleEdit(record: Recordable<any>) {
async function handleDelete(row: Recordable<any>) { async function handleDelete(row: Recordable<any>) {
await noticeRemove(row.noticeId); await noticeRemove(row.noticeId);
await tableApi.reload(); await tableApi.query();
} }
function handleMultiDelete() { function handleMultiDelete() {
@ -112,7 +112,7 @@ function handleMultiDelete() {
content: `确认删除选中的${ids.length}条记录吗?`, content: `确认删除选中的${ids.length}条记录吗?`,
onOk: async () => { onOk: async () => {
await noticeRemove(ids); await noticeRemove(ids);
await tableApi.reload(); await tableApi.query();
}, },
}); });
} }
@ -170,6 +170,6 @@ function handleMultiDelete() {
</Popconfirm> </Popconfirm>
</template> </template>
</BasicTable> </BasicTable>
<NoticeModal @reload="tableApi.reload()" /> <NoticeModal @reload="tableApi.query()" />
</Page> </Page>
</template> </template>

View File

@ -40,7 +40,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {

View File

@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {
@ -127,7 +127,7 @@ function handleMultiDelete() {
content: `确认删除选中的${ids.length}条记录吗?`, content: `确认删除选中的${ids.length}条记录吗?`,
onOk: async () => { onOk: async () => {
await postRemove(ids); await postRemove(ids);
await tableApi.reload(); await tableApi.query();
}, },
}); });
} }
@ -172,31 +172,29 @@ function handleMultiDelete() {
</Space> </Space>
</template> </template>
<template #action="{ row }"> <template #action="{ row }">
<Space> <a-button
size="small"
type="link"
v-access:code="['system:post:edit']"
@click="handleEdit(row)"
>
{{ $t('pages.common.edit') }}
</a-button>
<Popconfirm
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button <a-button
danger
size="small" size="small"
type="link" type="link"
v-access:code="['system:post:edit']" v-access:code="['system:post:remove']"
@click="handleEdit(row)" @click.stop=""
> >
{{ $t('pages.common.edit') }} {{ $t('pages.common.delete') }}
</a-button> </a-button>
<Popconfirm </Popconfirm>
placement="left"
title="确认删除?"
@confirm="handleDelete(row)"
>
<a-button
danger
size="small"
type="link"
v-access:code="['system:post:remove']"
@click.stop=""
>
{{ $t('pages.common.delete') }}
</a-button>
</Popconfirm>
</Space>
</template> </template>
</BasicTable> </BasicTable>
<PostDrawer @reload="tableApi.query()" /> <PostDrawer @reload="tableApi.query()" />

View File

@ -61,7 +61,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {

View File

@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {

View File

@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {

View File

@ -83,7 +83,7 @@ const gridOptions: VxeGridProps = {
pagerConfig: {}, pagerConfig: {},
proxyConfig: { proxyConfig: {
ajax: { ajax: {
query: async ({ page }, formValues) => { query: async ({ page }, formValues = {}) => {
// //
if (formValues?.createTime) { if (formValues?.createTime) {
formValues.params = { formValues.params = {