diff --git a/apps/web-antd/src/views/system/area/data.ts b/apps/web-antd/src/views/system/area/data.ts index 0f79f576a..e6cc06c99 100644 --- a/apps/web-antd/src/views/system/area/data.ts +++ b/apps/web-antd/src/views/system/area/data.ts @@ -34,6 +34,7 @@ export function useGridColumns(): VxeTableGridOptions['colum { field: 'id', title: '地区编码', + minWidth: 120, align: 'left', fixed: 'left', treeNode: true, @@ -41,6 +42,7 @@ export function useGridColumns(): VxeTableGridOptions['colum { field: 'name', title: '地区名称', + minWidth: 200, }, ]; } diff --git a/apps/web-antd/src/views/system/area/index.vue b/apps/web-antd/src/views/system/area/index.vue index 96159c0c8..a2b0cccb5 100644 --- a/apps/web-antd/src/views/system/area/index.vue +++ b/apps/web-antd/src/views/system/area/index.vue @@ -2,11 +2,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; -import { Search } from '@vben/icons'; -import { Button } from 'ant-design-vue'; - -import { useVbenVxeGrid } from '#/adapter/vxe-table'; +import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getAreaTree } from '#/api/system/area'; import { useGridColumns } from './data'; @@ -65,10 +62,16 @@ const [Grid, gridApi] = useVbenVxeGrid({ diff --git a/apps/web-ele/src/views/system/area/data.ts b/apps/web-ele/src/views/system/area/data.ts index 48339f19e..e6cc06c99 100644 --- a/apps/web-ele/src/views/system/area/data.ts +++ b/apps/web-ele/src/views/system/area/data.ts @@ -2,6 +2,8 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemAreaApi } from '#/api/system/area'; +import { z } from '#/adapter/form'; + /** 查询 IP 的表单 */ export function useFormSchema(): VbenFormSchema[] { return [ @@ -12,7 +14,7 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '请输入 IP 地址', }, - rules: 'required', + rules: z.string().ip({ message: '请输入正确的 IP 地址' }), }, { fieldName: 'result', diff --git a/apps/web-ele/src/views/system/area/index.vue b/apps/web-ele/src/views/system/area/index.vue index 59b242da6..c8495ce2a 100644 --- a/apps/web-ele/src/views/system/area/index.vue +++ b/apps/web-ele/src/views/system/area/index.vue @@ -2,11 +2,8 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; -import { Search } from '@vben/icons'; -import { ElButton } from 'element-plus'; - -import { useVbenVxeGrid } from '#/adapter/vxe-table'; +import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getAreaTree } from '#/api/system/area'; import { useGridColumns } from './data'; @@ -65,10 +62,16 @@ const [Grid, gridApi] = useVbenVxeGrid({