From 540f24ed43ab0da14e76686a28bd6252720aeb1f Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 8 May 2025 09:26:03 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E6=9B=B4=E6=96=B0=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=A2=9E=E5=8A=A0minWidth=E5=B1=9E=E6=80=A7"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b52f3ba0c54fc26a77086b5a2410e7fe2709ba8c. --- apps/web-antd/src/views/monitor/logininfor/data.tsx | 12 ++---------- apps/web-antd/src/views/monitor/online/data.ts | 8 -------- apps/web-antd/src/views/monitor/operlog/data.tsx | 13 +++++-------- apps/web-antd/src/views/system/config/data.ts | 5 ----- apps/web-antd/src/views/system/dept/data.ts | 10 +++------- apps/web-antd/src/views/system/dict/data/data.ts | 5 ----- apps/web-antd/src/views/system/dict/type/data.ts | 4 ---- apps/web-antd/src/views/system/menu/data.tsx | 3 --- apps/web-antd/src/views/system/notice/data.ts | 2 -- apps/web-antd/src/views/system/oss-config/data.tsx | 6 ------ apps/web-antd/src/views/system/oss/data.tsx | 7 ------- apps/web-antd/src/views/system/post/data.ts | 5 ----- apps/web-antd/src/views/system/role-assign/data.tsx | 4 ---- apps/web-antd/src/views/system/role/data.tsx | 6 ------ apps/web-antd/src/views/system/tenant/data.tsx | 6 ------ .../web-antd/src/views/system/tenantPackage/data.ts | 3 --- apps/web-antd/src/views/workflow/category/data.ts | 3 --- 17 files changed, 10 insertions(+), 92 deletions(-) diff --git a/apps/web-antd/src/views/monitor/logininfor/data.tsx b/apps/web-antd/src/views/monitor/logininfor/data.tsx index c929d45b..88825e4e 100644 --- a/apps/web-antd/src/views/monitor/logininfor/data.tsx +++ b/apps/web-antd/src/views/monitor/logininfor/data.tsx @@ -39,22 +39,19 @@ export const columns: VxeGridProps['columns'] = [ { title: '用户账号', field: 'userName', - minWidth: 120, }, { title: '登录平台', field: 'clientKey', - minWidth: 100, }, { title: 'IP地址', field: 'ipaddr', - minWidth: 180, }, { title: 'IP地点', field: 'loginLocation', - minWidth: 160, + width: 200, }, { title: '浏览器', @@ -64,7 +61,6 @@ export const columns: VxeGridProps['columns'] = [ return renderBrowserIcon(row.browser, true) as VNode; }, }, - minWidth: 180, }, { title: '系统', @@ -84,7 +80,6 @@ export const columns: VxeGridProps['columns'] = [ return renderOsIcon(value, true) as VNode; }, }, - minWidth: 180, }, { title: '登录结果', @@ -94,23 +89,20 @@ export const columns: VxeGridProps['columns'] = [ return renderDict(row.status, DictEnum.SYS_COMMON_STATUS); }, }, - minWidth: 100, }, { title: '信息', field: 'msg', - minWidth: 120, }, { title: '日期', field: 'loginTime', - minWidth: 160, }, { field: 'action', fixed: 'right', slots: { default: 'action' }, title: '操作', - width: 'auto', + width: 150, }, ]; diff --git a/apps/web-antd/src/views/monitor/online/data.ts b/apps/web-antd/src/views/monitor/online/data.ts index 8e16ded7..15944dc4 100644 --- a/apps/web-antd/src/views/monitor/online/data.ts +++ b/apps/web-antd/src/views/monitor/online/data.ts @@ -24,27 +24,22 @@ export const columns: VxeGridProps['columns'] = [ { title: '登录平台', field: 'deviceType', - minWidth: 100, }, { title: '登录账号', field: 'userName', - minWidth: 120, }, { title: '部门名称', field: 'deptName', - minWidth: 160, }, { title: 'IP地址', field: 'ipaddr', - minWidth: 180, }, { title: '登录地址', field: 'loginLocation', - minWidth: 160, }, { title: '浏览器', @@ -54,7 +49,6 @@ export const columns: VxeGridProps['columns'] = [ return renderBrowserIcon(row.browser, true) as VNode; }, }, - minWidth: 180, }, { title: '系统', @@ -72,7 +66,6 @@ export const columns: VxeGridProps['columns'] = [ return renderOsIcon(value, true) as VNode; }, }, - minWidth: 180, }, { title: '登录时间', @@ -80,7 +73,6 @@ export const columns: VxeGridProps['columns'] = [ formatter: ({ cellValue }) => { return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss'); }, - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/monitor/operlog/data.tsx b/apps/web-antd/src/views/monitor/operlog/data.tsx index 6dc9c517..d42b3709 100644 --- a/apps/web-antd/src/views/monitor/operlog/data.tsx +++ b/apps/web-antd/src/views/monitor/operlog/data.tsx @@ -50,7 +50,7 @@ export const querySchema: FormSchemaGetter = () => [ export const columns: VxeGridProps['columns'] = [ { type: 'checkbox', width: 60 }, - { field: 'title', title: '系统模块', minWidth: 120 }, + { field: 'title', title: '系统模块' }, { title: '操作类型', field: 'businessType', @@ -59,11 +59,10 @@ export const columns: VxeGridProps['columns'] = [ return renderDict(row.businessType, DictEnum.SYS_OPER_TYPE); }, }, - minWidth: 120, }, - { field: 'operName', title: '操作人员', minWidth: 120 }, - { field: 'operIp', title: 'IP地址', minWidth: 180 }, - { field: 'operLocation', title: 'IP信息', minWidth: 160 }, + { field: 'operName', title: '操作人员' }, + { field: 'operIp', title: 'IP地址' }, + { field: 'operLocation', title: 'IP信息' }, { field: 'status', title: '操作状态', @@ -72,9 +71,8 @@ export const columns: VxeGridProps['columns'] = [ return renderDict(row.status, DictEnum.SYS_COMMON_STATUS); }, }, - minWidth: 100, }, - { field: 'operTime', title: '操作日期', sortable: true, minWidth: 160 }, + { field: 'operTime', title: '操作日期', sortable: true }, { field: 'costTime', title: '操作耗时', @@ -82,7 +80,6 @@ export const columns: VxeGridProps['columns'] = [ formatter({ cellValue }) { return `${cellValue} ms`; }, - minWidth: 100, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/config/data.ts b/apps/web-antd/src/views/system/config/data.ts index 84996299..0b462e4f 100644 --- a/apps/web-antd/src/views/system/config/data.ts +++ b/apps/web-antd/src/views/system/config/data.ts @@ -39,17 +39,14 @@ export const columns: VxeGridProps['columns'] = [ { title: '参数名称', field: 'configName', - minWidth: 160, }, { title: '参数KEY', field: 'configKey', - minWidth: 160, }, { title: '参数Value', field: 'configValue', - minWidth: 200, }, { title: '系统内置', @@ -64,12 +61,10 @@ export const columns: VxeGridProps['columns'] = [ { title: '备注', field: 'remark', - minWidth: 120, }, { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index 47566dd6..8ae8a96d 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -30,36 +30,32 @@ export const columns: VxeGridProps['columns'] = [ field: 'deptName', title: '部门名称', treeNode: true, - resizable: false, - minWidth: 220, + width: 200, }, { field: 'deptCategory', title: '类别编码', - resizable: false, - minWidth: 120, }, { field: 'orderNum', title: '排序', resizable: false, - width: 80, + width: 'auto', }, { field: 'status', resizable: false, + width: 'auto', title: '状态', slots: { default: ({ row }) => { return renderDict(row.status, DictEnum.SYS_NORMAL_DISABLE); }, }, - width: 120, }, { field: 'createTime', title: '创建时间', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/dict/data/data.ts b/apps/web-antd/src/views/system/dict/data/data.ts index 482ca1ec..087e96b2 100644 --- a/apps/web-antd/src/views/system/dict/data/data.ts +++ b/apps/web-antd/src/views/system/dict/data/data.ts @@ -23,27 +23,22 @@ export const columns: VxeGridProps['columns'] = [ return renderDictTag(dictValue, [row]); }, }, - minWidth: 120, }, { title: '字典键值', field: 'dictValue', - minWidth: 100, }, { title: '字典排序', field: 'dictSort', - minWidth: 80, }, { title: '备注', field: 'remark', - minWidth: 120, }, { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/dict/type/data.ts b/apps/web-antd/src/views/system/dict/type/data.ts index dd766cad..cfd584a7 100644 --- a/apps/web-antd/src/views/system/dict/type/data.ts +++ b/apps/web-antd/src/views/system/dict/type/data.ts @@ -21,22 +21,18 @@ export const columns: VxeGridProps['columns'] = [ { title: '字典名称', field: 'dictName', - minWidth: 120, }, { title: '字典类型', field: 'dictType', - minWidth: 160, }, { title: '备注', field: 'remark', - minWidth: 120, }, { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/menu/data.tsx b/apps/web-antd/src/views/system/menu/data.tsx index 9a29b9d5..f29cc4f3 100644 --- a/apps/web-antd/src/views/system/menu/data.tsx +++ b/apps/web-antd/src/views/system/menu/data.tsx @@ -111,12 +111,10 @@ export const columns: VxeGridProps['columns'] = [ { title: '权限标识', field: 'perms', - minWidth: 200, }, { title: '组件路径', field: 'component', - minWidth: 200, }, { title: '状态', @@ -141,7 +139,6 @@ export const columns: VxeGridProps['columns'] = [ { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/notice/data.ts b/apps/web-antd/src/views/system/notice/data.ts index 726e64b6..8e052c19 100644 --- a/apps/web-antd/src/views/system/notice/data.ts +++ b/apps/web-antd/src/views/system/notice/data.ts @@ -34,7 +34,6 @@ export const columns: VxeGridProps['columns'] = [ { title: '公告标题', field: 'noticeTitle', - minWidth: 220, }, { title: '公告类型', @@ -64,7 +63,6 @@ export const columns: VxeGridProps['columns'] = [ { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/oss-config/data.tsx b/apps/web-antd/src/views/system/oss-config/data.tsx index f0439a05..2d086210 100644 --- a/apps/web-antd/src/views/system/oss-config/data.tsx +++ b/apps/web-antd/src/views/system/oss-config/data.tsx @@ -40,23 +40,19 @@ export const columns: VxeGridProps['columns'] = [ { title: '配置名称', field: 'configKey', - minWidth: 120, }, { title: '访问站点', field: 'endpoint', showOverflow: true, - minWidth: 220, }, { title: '桶名称', field: 'bucketName', - minWidth: 140, }, { title: '域', field: 'region', - minWidth: 140, }, { title: '权限桶类型', @@ -72,7 +68,6 @@ export const columns: VxeGridProps['columns'] = [ return '未知类型'; }, }, - minWidth: 120, }, { title: '是否默认', @@ -80,7 +75,6 @@ export const columns: VxeGridProps['columns'] = [ slots: { default: 'status', }, - minWidth: 120, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/oss/data.tsx b/apps/web-antd/src/views/system/oss/data.tsx index b2ed399c..ec834796 100644 --- a/apps/web-antd/src/views/system/oss/data.tsx +++ b/apps/web-antd/src/views/system/oss/data.tsx @@ -35,41 +35,34 @@ export const columns: VxeGridProps['columns'] = [ title: '文件名', field: 'fileName', showOverflow: true, - minWidth: 160, }, { title: '文件原名', field: 'originalName', showOverflow: true, - minWidth: 160, }, { title: '文件拓展名', field: 'fileSuffix', - minWidth: 120, }, { title: '文件预览', field: 'url', showOverflow: true, slots: { default: 'url' }, - minWidth: 180, }, { title: '创建时间', field: 'createTime', sortable: true, - minWidth: 160, }, { title: '上传人', field: 'createByName', - minWidth: 120, }, { title: '服务商', field: 'service', - minWidth: 120, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/post/data.ts b/apps/web-antd/src/views/system/post/data.ts index 9eb35a9a..e8595553 100644 --- a/apps/web-antd/src/views/system/post/data.ts +++ b/apps/web-antd/src/views/system/post/data.ts @@ -34,22 +34,18 @@ export const columns: VxeGridProps['columns'] = [ { title: '岗位编码', field: 'postCode', - minWidth: 120, }, { title: '类别编码', field: 'postCategory', - minWidth: 120, }, { title: '岗位名称', field: 'postName', - minWidth: 120, }, { title: '排序', field: 'postSort', - minWidth: 80, }, { title: '状态', @@ -59,7 +55,6 @@ export const columns: VxeGridProps['columns'] = [ return renderDict(row.status, DictEnum.SYS_NORMAL_DISABLE); }, }, - minWidth: 120, }, { title: '创建时间', diff --git a/apps/web-antd/src/views/system/role-assign/data.tsx b/apps/web-antd/src/views/system/role-assign/data.tsx index 456339be..a26bd164 100644 --- a/apps/web-antd/src/views/system/role-assign/data.tsx +++ b/apps/web-antd/src/views/system/role-assign/data.tsx @@ -19,22 +19,18 @@ export const columns: VxeGridProps['columns'] = [ { title: '用户账号', field: 'userName', - minWidth: 120, }, { title: '用户昵称', field: 'nickName', - minWidth: 120, }, { title: '邮箱', field: 'email', - minWidth: 180, }, { title: '手机号', field: 'phonenumber', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/role/data.tsx b/apps/web-antd/src/views/system/role/data.tsx index b2e87e84..4fe79453 100644 --- a/apps/web-antd/src/views/system/role/data.tsx +++ b/apps/web-antd/src/views/system/role/data.tsx @@ -51,7 +51,6 @@ export const columns: VxeGridProps['columns'] = [ { title: '角色名称', field: 'roleName', - minWidth: 100, }, { title: '权限字符', @@ -61,7 +60,6 @@ export const columns: VxeGridProps['columns'] = [ return {row.roleKey}; }, }, - minWidth: 120, }, { title: '数据权限', @@ -77,23 +75,19 @@ export const columns: VxeGridProps['columns'] = [ return {row.dataScope}; }, }, - minWidth: 160, }, { title: '排序', field: 'roleSort', - minWidth: 60, }, { title: '状态', field: 'status', slots: { default: 'status' }, - minWidth: 80, }, { title: '创建时间', field: 'createTime', - minWidth: 160, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/tenant/data.tsx b/apps/web-antd/src/views/system/tenant/data.tsx index 25712819..69af062b 100644 --- a/apps/web-antd/src/views/system/tenant/data.tsx +++ b/apps/web-antd/src/views/system/tenant/data.tsx @@ -35,22 +35,18 @@ export const columns: VxeGridProps['columns'] = [ { title: '租户编号', field: 'tenantId', - minWidth: 120, }, { title: '租户名称', field: 'companyName', - minWidth: 240, }, { title: '联系人', field: 'contactUserName', - minWidth: 120, }, { title: '联系电话', field: 'contactPhone', - minWidth: 160, }, { title: '到期时间', @@ -61,13 +57,11 @@ export const columns: VxeGridProps['columns'] = [ } return cellValue; }, - minWidth: 160, }, { title: '租户状态', field: 'status', slots: { default: 'status' }, - minWidth: 100, }, { field: 'action', diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts index b590984d..a80de6a5 100644 --- a/apps/web-antd/src/views/system/tenantPackage/data.ts +++ b/apps/web-antd/src/views/system/tenantPackage/data.ts @@ -14,18 +14,15 @@ export const columns: VxeGridProps['columns'] = [ { title: '套餐名称', field: 'packageName', - minWidth: 160, }, { title: '备注', field: 'remark', - minWidth: 180, }, { title: '状态', field: 'status', slots: { default: 'status' }, - minWidth: 100, }, { field: 'action', diff --git a/apps/web-antd/src/views/workflow/category/data.ts b/apps/web-antd/src/views/workflow/category/data.ts index 8c6d34cf..9dfe1940 100644 --- a/apps/web-antd/src/views/workflow/category/data.ts +++ b/apps/web-antd/src/views/workflow/category/data.ts @@ -19,17 +19,14 @@ export const columns: VxeGridProps['columns'] = [ field: 'categoryName', title: '分类名称', treeNode: true, - minWidth: 200, }, { field: 'orderNum', title: '排序', - minWidth: 80, }, { field: 'createTime', title: '创建时间', - minWidth: 160, }, { field: 'action',