gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎修复经典布局时表格自增情况

Browse Source
This commit is contained in:
zuohuaijun 2024-07-31 02:30:08 +08:00
parent 6d55f4033b
commit 78c1ccd1da
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2024.07.28", "lastBuildTime": "2024.07.31",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -14,8 +14,8 @@
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^1.2.27", "@logicflow/core": "^1.2.28",
"@logicflow/extension": "^1.2.27", "@logicflow/extension": "^1.2.28",
"@microsoft/signalr": "^8.0.7", "@microsoft/signalr": "^8.0.7",
"@vue-office/docx": "^1.6.2", "@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.11", "@vue-office/excel": "^1.7.11",
@ -82,8 +82,8 @@
"@types/node": "^20.14.13", "@types/node": "^20.14.13",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^7.17.0", "@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.17.0", "@typescript-eslint/parser": "^7.18.0",
"@vitejs/plugin-vue": "^5.1.1", "@vitejs/plugin-vue": "^5.1.1",
"@vitejs/plugin-vue-jsx": "^4.0.0", "@vitejs/plugin-vue-jsx": "^4.0.0",
"@vue/compiler-sfc": "^3.4.34", "@vue/compiler-sfc": "^3.4.34",

6
Web/src/theme/vxeTable.scss
View File

@ -82,6 +82,12 @@
color: unset !important; color: unset !important;
} }
// 表格默认样式-修复经典布局时自增情况
.xGrid-style {
display: flex;
flex-direction: column;
}
// :deep(.xGrid-style .vxe-body--row.warning-row) { // :deep(.xGrid-style .vxe-body--row.warning-row) {
// background-color: var(--el-color-warning-light-9); // background-color: var(--el-color-warning-light-9);
// } // }

2
Web/src/views/system/user/index.vue
View File

@ -39,7 +39,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card class="full-table" shadow="hover" style="margin-top: 5px; flex: 1"> <el-card class="full-table" shadow="hover" style="margin-top: 5px">
<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents"> <vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
<template #toolbar_buttons> <template #toolbar_buttons>
<el-button type="primary" icon="ele-Plus" @click="handleAdd" v-auth="'sysUser/add'"> 新增 </el-button> <el-button type="primary" icon="ele-Plus" @click="handleAdd" v-auth="'sysUser/add'"> 新增 </el-button>