From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 14:00:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/base/BaseComputHeight.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/admin/src/components/base/BaseComputHeight.vue b/admin/src/components/base/BaseComputHeight.vue
index a1a58f1..c4cc769 100644
--- a/admin/src/components/base/BaseComputHeight.vue
+++ b/admin/src/components/base/BaseComputHeight.vue
@@ -1,20 +1,25 @@
<script>
+import {mapState} from "vuex";
+
export default {
name: 'BaseComputeHeight',
data () {
return {
- tableHeightNew: 300
+ // tableHeightNew: 300
}
},
+ computed: {
+ ...mapState(['tableHeightNew'])
+ },
created() {
- this.computeTableHeight()
+ // this.computeTableHeight()
},
mounted () {
- this.computeTableHeight()
- window.addEventListener('resize', this.computeTableHeight)
+ // this.computeTableHeight()
+ // window.addEventListener('resize', this.computeTableHeight)
},
activated() {
- this.computeTableHeight()
+ // this.computeTableHeight()
},
methods: {
computeTableHeight () {
--
Gitblit v1.9.3