diff --git a/apps/web-antd/src/api/system/dept/index.ts b/apps/web-antd/src/api/system/dept/index.ts index 3b5e44a4..7557537d 100644 --- a/apps/web-antd/src/api/system/dept/index.ts +++ b/apps/web-antd/src/api/system/dept/index.ts @@ -1,6 +1,6 @@ import type { Dept } from './model'; -import type { ID, PageQuery } from '#/api/common'; +import type { ID } from '#/api/common'; import { requestClient } from '#/api/request'; @@ -10,7 +10,7 @@ enum Api { root = '/system/dept', } -export function deptList(params?: PageQuery) { +export function deptList(params?: any) { return requestClient.get(Api.deptList, { params }); } diff --git a/apps/web-antd/src/api/system/menu/index.ts b/apps/web-antd/src/api/system/menu/index.ts index 7754e730..65c3b4f9 100644 --- a/apps/web-antd/src/api/system/menu/index.ts +++ b/apps/web-antd/src/api/system/menu/index.ts @@ -1,6 +1,6 @@ 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'; @@ -12,7 +12,7 @@ enum Api { tenantPackageMenuTreeselect = '/system/menu/tenantPackageMenuTreeselect', } -export function menuList(params?: PageQuery) { +export function menuList(params?: any) { return requestClient.get(Api.menuList, { params }); } diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue index d5b75986..06efc7e9 100644 --- a/apps/web-antd/src/views/monitor/logininfor/index.vue +++ b/apps/web-antd/src/views/monitor/logininfor/index.vue @@ -44,7 +44,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { return await loginInfoList({ pageNum: page.currentPage, pageSize: page.pageSize, @@ -147,7 +147,7 @@ async function handleUnlock() { :disabled="!checked" danger type="primary" - v-access:code="['monitor:logininfor:delete']" + v-access:code="['monitor:logininfor:remove']" @click="handleMultiDelete" > {{ $t('pages.common.delete') }} @@ -158,20 +158,24 @@ async function handleUnlock() { diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue index 29780671..312e5618 100644 --- a/apps/web-antd/src/views/system/client/index.vue +++ b/apps/web-antd/src/views/system/client/index.vue @@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { return await clientList({ pageNum: page.currentPage, pageSize: page.pageSize, diff --git a/apps/web-antd/src/views/system/config/index.vue b/apps/web-antd/src/views/system/config/index.vue index a4382e50..89538b5c 100644 --- a/apps/web-antd/src/views/system/config/index.vue +++ b/apps/web-antd/src/views/system/config/index.vue @@ -43,7 +43,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { @@ -105,7 +105,7 @@ async function handleEdit(record: Recordable) { async function handleDelete(row: Recordable) { await configRemove(row.configId); - await tableApi.reload(); + await tableApi.query(); } function handleMultiDelete() { @@ -117,14 +117,14 @@ function handleMultiDelete() { content: `确认删除选中的${ids.length}条记录吗?`, onOk: async () => { await configRemove(ids); - await tableApi.reload(); + await tableApi.query(); }, }); } async function handleRefreshCache() { await configRefreshCache(); - await tableApi.reload(); + await tableApi.query(); } @@ -187,6 +187,6 @@ async function handleRefreshCache() { - + diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index 59e3e656..43503ba8 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -117,13 +117,18 @@ export const drawerSchema: FormSchemaGetter = () => [ rules: z .string() .regex(/^1[3,4578]\d{9}$/, { message: '请输入正确的手机号' }) - .optional(), + .optional() + .or(z.literal('')), }, { component: 'Input', fieldName: 'email', label: '邮箱', - rules: z.string().email({ message: '请输入正确的邮箱' }).optional(), + rules: z + .string() + .email({ message: '请输入正确的邮箱' }) + .optional() + .or(z.literal('')), }, { component: 'RadioGroup', diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index 2f80caca..c8983b28 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -31,7 +31,7 @@ const gridOptions: VxeGridProps = { }, proxyConfig: { ajax: { - query: async (_, formValues) => { + query: async (_, formValues = {}) => { const resp = await deptList({ ...formValues, }); @@ -117,31 +117,29 @@ function collapseAll() { diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue index c8da8694..54525ed4 100644 --- a/apps/web-antd/src/views/system/menu/index.vue +++ b/apps/web-antd/src/views/system/menu/index.vue @@ -29,7 +29,7 @@ const gridOptions: VxeGridProps = { }, proxyConfig: { ajax: { - query: async (_, formValues) => { + query: async (_, formValues = {}) => { const resp = await menuList({ ...formValues, }); @@ -109,31 +109,29 @@ function collapseAll() { diff --git a/apps/web-antd/src/views/system/notice/index.vue b/apps/web-antd/src/views/system/notice/index.vue index 72a13920..bd255909 100644 --- a/apps/web-antd/src/views/system/notice/index.vue +++ b/apps/web-antd/src/views/system/notice/index.vue @@ -37,7 +37,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { @@ -100,7 +100,7 @@ async function handleEdit(record: Recordable) { async function handleDelete(row: Recordable) { await noticeRemove(row.noticeId); - await tableApi.reload(); + await tableApi.query(); } function handleMultiDelete() { @@ -112,7 +112,7 @@ function handleMultiDelete() { content: `确认删除选中的${ids.length}条记录吗?`, onOk: async () => { await noticeRemove(ids); - await tableApi.reload(); + await tableApi.query(); }, }); } @@ -170,6 +170,6 @@ function handleMultiDelete() { - + diff --git a/apps/web-antd/src/views/system/oss-config/index.vue b/apps/web-antd/src/views/system/oss-config/index.vue index 96c18e38..d361a42f 100644 --- a/apps/web-antd/src/views/system/oss-config/index.vue +++ b/apps/web-antd/src/views/system/oss-config/index.vue @@ -40,7 +40,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { diff --git a/apps/web-antd/src/views/system/post/index.vue b/apps/web-antd/src/views/system/post/index.vue index 3dc1c821..e28576e7 100644 --- a/apps/web-antd/src/views/system/post/index.vue +++ b/apps/web-antd/src/views/system/post/index.vue @@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { @@ -127,7 +127,7 @@ function handleMultiDelete() { content: `确认删除选中的${ids.length}条记录吗?`, onOk: async () => { await postRemove(ids); - await tableApi.reload(); + await tableApi.query(); }, }); } @@ -172,31 +172,29 @@ function handleMultiDelete() { diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue index 44c54b3d..0ed3092a 100644 --- a/apps/web-antd/src/views/system/role/index.vue +++ b/apps/web-antd/src/views/system/role/index.vue @@ -61,7 +61,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue index f8033d92..9c04e32a 100644 --- a/apps/web-antd/src/views/system/tenant/index.vue +++ b/apps/web-antd/src/views/system/tenant/index.vue @@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { diff --git a/apps/web-antd/src/views/system/tenantPackage/index.vue b/apps/web-antd/src/views/system/tenantPackage/index.vue index 3013da23..cc3619dc 100644 --- a/apps/web-antd/src/views/system/tenantPackage/index.vue +++ b/apps/web-antd/src/views/system/tenantPackage/index.vue @@ -45,7 +45,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = { diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 2302d790..4d81f2b0 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -83,7 +83,7 @@ const gridOptions: VxeGridProps = { pagerConfig: {}, proxyConfig: { ajax: { - query: async ({ page }, formValues) => { + query: async ({ page }, formValues = {}) => { // 区间选择器处理 if (formValues?.createTime) { formValues.params = {