From 2045f3ec13a528e1acf6961da156c5204974e3bd Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 29 May 2025 09:43:54 +0800
Subject: [PATCH] feat: 统一去除高度
---
src/views/odm/task.vue | 2
src/option/system/dictbiz.js | 4 -
src/page/index/index.vue | 13 ++++
src/views/resource/oss.vue | 2
src/views/resource/waylineFile.vue | 4 -
src/views/system/sysConfig.vue | 10 +--
src/views/system/user.vue | 4 +
src/views/device/components/firmwareManage.vue | 2
src/views/device/devicePerMenu.vue | 2
src/views/system/tenant.vue | 2
src/option/system/dict.js | 2
src/views/report/reportlist.vue | 2
src/views/system/tenantpackage.vue | 2
src/option/job/jobserver.js | 2
src/views/work/claim.vue | 2
src/views/flow/manager.vue | 2
src/views/work/done.vue | 2
src/views/monitor/log/usual.vue | 2
src/const/tool/model.js | 1
src/views/resource/attach.vue | 2
src/views/resource/wayline.vue | 26 ++++----
src/views/flow/model.vue | 2
src/views/resource/media.vue | 4 -
src/views/system/topmenu.vue | 2
src/views/flow/follow.vue | 2
src/views/device/components/devicePerShare.vue | 6 -
src/views/workspace/index.vue | 2
src/views/tool/code.vue | 2
src/option/job/jobinfo.js | 2
src/views/desk/notice.vue | 2
src/views/work/send.vue | 2
src/views/resource/sms.vue | 2
src/views/system/post.vue | 2
src/views/work/start.vue | 2
src/views/work/todo.vue | 2
src/views/system/client.vue | 2
src/views/tool/datasource.vue | 2
37 files changed, 36 insertions(+), 92 deletions(-)
diff --git a/src/const/tool/model.js b/src/const/tool/model.js
index 74b4380..8c929af 100644
--- a/src/const/tool/model.js
+++ b/src/const/tool/model.js
@@ -138,7 +138,6 @@
];
export const option = {
- height: 'auto',
searchShow: true,
searchMenuSpan: 6,
tip: false,
diff --git a/src/option/job/jobinfo.js b/src/option/job/jobinfo.js
index ee43614..167c814 100644
--- a/src/option/job/jobinfo.js
+++ b/src/option/job/jobinfo.js
@@ -116,8 +116,6 @@
];
export default {
- height: 'auto',
- calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/option/job/jobserver.js b/src/option/job/jobserver.js
index 27914be..5ac5689 100644
--- a/src/option/job/jobserver.js
+++ b/src/option/job/jobserver.js
@@ -1,6 +1,4 @@
export default {
- height: 'auto',
- calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/option/system/dict.js b/src/option/system/dict.js
index b76bb04..7a2cd7c 100644
--- a/src/option/system/dict.js
+++ b/src/option/system/dict.js
@@ -86,8 +86,6 @@
};
export const optionChild = {
- height: 'auto',
- calcHeight: 95,
tip: false,
searchShow: true,
searchMenuSpan: 10,
diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js
index 18a884b..2b3bce3 100644
--- a/src/option/system/dictbiz.js
+++ b/src/option/system/dictbiz.js
@@ -1,6 +1,4 @@
export const optionParent = {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 10,
@@ -89,8 +87,6 @@
};
export const optionChild = {
- height: 'auto',
- calcHeight: 95,
tip: false,
searchShow: true,
searchMenuSpan: 10,
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 9088b84..1079687 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -112,3 +112,16 @@
},
};
</script>
+
+<style lang="scss" scoped>
+#avue-view{
+ :deep(){
+ .avue-crud__body{
+ .el-form{
+ height: 745px;
+ overflow: auto;
+ }
+ }
+ }
+}
+</style>
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index fef8b6d..84a2b12 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -54,8 +54,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
diff --git a/src/views/device/components/devicePerShare.vue b/src/views/device/components/devicePerShare.vue
index 820fd9e..0abf44a 100644
--- a/src/views/device/components/devicePerShare.vue
+++ b/src/views/device/components/devicePerShare.vue
@@ -46,8 +46,6 @@
option: {
lazy: true,
tree: true,
- height: 'auto',
- calcHeight: 32,
dialogWidth: 750,
tip: false,
searchShow: true,
@@ -176,7 +174,7 @@
// 添加毫秒级时间戳
row['createTime'] = Date.now();
row['deviceSn'] = this.deviceSn;
-
+
add(row).then(
() => {
this.initFlag = false;
@@ -309,4 +307,4 @@
.firmware_status:hover {
cursor: pointer;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/firmwareManage.vue b/src/views/device/components/firmwareManage.vue
index 9c397ea..ff9ba05 100644
--- a/src/views/device/components/firmwareManage.vue
+++ b/src/views/device/components/firmwareManage.vue
@@ -101,8 +101,6 @@
option: {
lazy: true,
tree: true,
- height: 'atuo',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
diff --git a/src/views/device/devicePerMenu.vue b/src/views/device/devicePerMenu.vue
index 0af498c..e80299e 100644
--- a/src/views/device/devicePerMenu.vue
+++ b/src/views/device/devicePerMenu.vue
@@ -41,8 +41,6 @@
},
selectionList: [],
option: {
- height: 'atuo',
- calcHeight: 32,
dialogWidth: 750,
tip: false,
searchShow: true,
diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue
index 3c9938b..f600bce 100644
--- a/src/views/flow/follow.vue
+++ b/src/views/flow/follow.vue
@@ -58,8 +58,6 @@
followBox: false,
deleteReason: '',
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue
index 6658cef..09ff99a 100644
--- a/src/views/flow/manager.vue
+++ b/src/views/flow/manager.vue
@@ -146,8 +146,6 @@
},
],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue
index bbc4794..fa06a03 100644
--- a/src/views/flow/model.vue
+++ b/src/views/flow/model.vue
@@ -236,8 +236,6 @@
flowBox: false,
flowUrl: '',
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue
index 2b6d1fa..17a335b 100644
--- a/src/views/monitor/log/usual.vue
+++ b/src/views/monitor/log/usual.vue
@@ -37,8 +37,6 @@
total: 0,
},
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/odm/task.vue b/src/views/odm/task.vue
index a6d1744..a712851 100644
--- a/src/views/odm/task.vue
+++ b/src/views/odm/task.vue
@@ -76,8 +76,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
diff --git a/src/views/report/reportlist.vue b/src/views/report/reportlist.vue
index 783eb4c..d7072f8 100644
--- a/src/views/report/reportlist.vue
+++ b/src/views/report/reportlist.vue
@@ -64,8 +64,6 @@
total: 0,
},
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index 71cffee..395155f 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -76,8 +76,6 @@
attachBox: false,
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/media.vue b/src/views/resource/media.vue
index 6d5f575..424c459 100644
--- a/src/views/resource/media.vue
+++ b/src/views/resource/media.vue
@@ -57,8 +57,6 @@
selectionList: [],
selectedWorkspaceId: null,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -348,4 +346,4 @@
};
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index e9a4946..2d5236f 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -88,8 +88,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/sms.vue b/src/views/resource/sms.vue
index b68bafc..3854e6b 100644
--- a/src/views/resource/sms.vue
+++ b/src/views/resource/sms.vue
@@ -80,8 +80,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/resource/wayline.vue b/src/views/resource/wayline.vue
index d357751..93ec2de 100644
--- a/src/views/resource/wayline.vue
+++ b/src/views/resource/wayline.vue
@@ -1,19 +1,19 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- v-model:page="page"
+ <avue-crud
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ v-model:page="page"
:permission="permissionList"
- v-model="form"
- ref="crud"
- @search-change="searchChange"
+ v-model="form"
+ ref="crud"
+ @search-change="searchChange"
@search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
@size-change="sizeChange"
- @refresh-change="refreshChange"
+ @refresh-change="refreshChange"
@on-load="onLoad">
</avue-crud>
</basic-container>
@@ -51,8 +51,6 @@
selectionList: [],
selectedWorkspaceId: null,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -307,4 +305,4 @@
};
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/resource/waylineFile.vue b/src/views/resource/waylineFile.vue
index aef1be5..61e845f 100644
--- a/src/views/resource/waylineFile.vue
+++ b/src/views/resource/waylineFile.vue
@@ -33,8 +33,6 @@
selectedWorkspaceId: null,
data: [],
option: {
- height: 'auto',
- calcHeight: 30,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -233,4 +231,4 @@
.avue-crud .el-table {
max-height: none !important;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index 9269c6a..bddeead 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -51,8 +51,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
index 4ab72a5..ae654e2 100644
--- a/src/views/system/post.vue
+++ b/src/views/system/post.vue
@@ -55,8 +55,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/sysConfig.vue b/src/views/system/sysConfig.vue
index 65dfc20..0144f32 100644
--- a/src/views/system/sysConfig.vue
+++ b/src/views/system/sysConfig.vue
@@ -21,10 +21,10 @@
@on-load="onLoad"
>
<template #menu-left>
- <el-button
- type="primary"
+ <el-button
+ type="primary"
icon="el-icon-plus"
- v-if="permissionList.addBtn"
+ v-if="permissionList.addBtn"
@click="$refs.crud.rowAdd()"
>新增</el-button>
<el-button
@@ -70,8 +70,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
@@ -304,4 +302,4 @@
};
</script>
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 947ea35..a024124 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -216,8 +216,6 @@
total: 0,
},
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/tenantpackage.vue b/src/views/system/tenantpackage.vue
index 9a90bc6..96c1330 100644
--- a/src/views/system/tenantpackage.vue
+++ b/src/views/system/tenantpackage.vue
@@ -44,8 +44,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index ef10895..16049bd 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -109,8 +109,6 @@
menuGrantList: [],
menuTreeObj: [],
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 951cf6c..2ac2490 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1085,7 +1085,7 @@
};
</script>
-<style>
+<style lang="scss">
.box {
height: 800px;
}
@@ -1097,4 +1097,6 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
+
+
</style>
diff --git a/src/views/tool/code.vue b/src/views/tool/code.vue
index 7dd3d7e..a398b4d 100644
--- a/src/views/tool/code.vue
+++ b/src/views/tool/code.vue
@@ -68,8 +68,6 @@
total: 0,
},
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/tool/datasource.vue b/src/views/tool/datasource.vue
index 2b6036e..a5d42e6 100644
--- a/src/views/tool/datasource.vue
+++ b/src/views/tool/datasource.vue
@@ -52,8 +52,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 900,
tip: false,
searchShow: true,
diff --git a/src/views/work/claim.vue b/src/views/work/claim.vue
index d2d34ae..a3a85d9 100644
--- a/src/views/work/claim.vue
+++ b/src/views/work/claim.vue
@@ -96,8 +96,6 @@
flowUrl: '',
workBox: false,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/work/done.vue b/src/views/work/done.vue
index d9f9dbb..6d447cf 100644
--- a/src/views/work/done.vue
+++ b/src/views/work/done.vue
@@ -89,8 +89,6 @@
flowUrl: '',
workBox: false,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/send.vue b/src/views/work/send.vue
index 0465939..d6d96fb 100644
--- a/src/views/work/send.vue
+++ b/src/views/work/send.vue
@@ -92,8 +92,6 @@
flowUrl: '',
workBox: false,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/start.vue b/src/views/work/start.vue
index 2b1eeec..bda1a2b 100644
--- a/src/views/work/start.vue
+++ b/src/views/work/start.vue
@@ -105,8 +105,6 @@
flowUrl: '',
workBox: false,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
searchShow: true,
searchMenuSpan: 6,
diff --git a/src/views/work/todo.vue b/src/views/work/todo.vue
index ae17336..bac64a3 100644
--- a/src/views/work/todo.vue
+++ b/src/views/work/todo.vue
@@ -96,8 +96,6 @@
flowUrl: '',
workBox: false,
option: {
- height: 'auto',
- calcHeight: 32,
tip: false,
simplePage: true,
searchShow: true,
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index ad82f47..04293d1 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -51,8 +51,6 @@
},
selectionList: [],
option: {
- height: 'auto',
- calcHeight: 32,
dialogWidth: 950,
tip: false,
searchShow: true,
--
Gitblit v1.9.3