From 2c80b9b04a7e6697a63cfc6d081fc99e6810f894 Mon Sep 17 00:00:00 2001
From: "wu.jian2" <distantmtn@gmail.com>
Date: Thu, 6 Jul 2023 15:52:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E7=BB=84=E4=BB=B6=E8=AE=BE=E8=AE=A1=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=BF=80=E6=B4=BB=E5=B7=A6=E4=BE=A7?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=B9=B6=E9=87=8D=E6=96=B0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E7=9A=84=E5=88=86=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data-room-ui/package.json                     |  2 +-
 .../BigScreenComponentMag/SideMenu.vue        | 19 +++++++------------
 .../packages/BigScreenComponentMag/index.vue  | 13 +++++++++----
 data-room-ui/packages/BizComponent/index.vue  | 11 +++++++----
 data-room-ui/packages/ComponentList/index.vue | 13 +++++++------
 .../DataSetManagement/src/CustomEditForm.vue  |  5 +++--
 .../src/OriginalEditForm.vue                  |  7 ++++---
 .../packages/DataSetManagement/src/index.vue  |  3 +++
 .../DataSourceManagement/src/index.vue        | 19 ++++++++++++++++++-
 .../public/config/index-development.js        |  2 +-
 10 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/data-room-ui/package.json b/data-room-ui/package.json
index e70c54a6..c85ddedf 100644
--- a/data-room-ui/package.json
+++ b/data-room-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gcpaas/data-room-ui",
-  "version": "0.0.1-2023070501-Alpha",
+  "version": "0.0.1-2023070601-Alpha",
   "description": "自定义大屏",
   "author": "gc-starter",
   "license": "MIT",
diff --git a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
index ed70f367..041b3530 100644
--- a/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
+++ b/data-room-ui/packages/BigScreenComponentMag/SideMenu.vue
@@ -14,7 +14,6 @@
   </div>
 </template>
 <script>
-
 export default {
   components: {},
   data () {
@@ -37,23 +36,19 @@ export default {
     }
   },
   created () {
-    const type = this.$route?.query?.type
-    if (type) {
-      this.componentHandle(this.componentList.find(item => item.type === type))
-    } else {
-      this.componentHandle(this.componentList[0])
+    const { globalData } = this.$router.app.$options
+    if (globalData?.componentsManagementType) {
+      this.activeType = globalData.componentsManagementType
+      this.$emit('getPageInfo', globalData.componentsManagementType)
+      // 清除this.$router.app.$options.globalData.componentsManagementType
+      delete globalData.componentsManagementType
     }
   },
   methods: {
     // 点击左侧组件
     componentHandle (com) {
       this.activeType = com.type
-      this.$router.push({
-        path: window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components',
-        query: {
-          type: com.type
-        }
-      })
+      this.$emit('getPageInfo', com.type)
     }
   }
 }
diff --git a/data-room-ui/packages/BigScreenComponentMag/index.vue b/data-room-ui/packages/BigScreenComponentMag/index.vue
index 18e6b943..e6df90db 100644
--- a/data-room-ui/packages/BigScreenComponentMag/index.vue
+++ b/data-room-ui/packages/BigScreenComponentMag/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="bs-manage-main-wrap">
-    <side-menu />
-    <menu-content />
+    <side-menu @getPageInfo="getPageInfo" />
+    <menu-content :catalog-info="catalogInfo" />
   </div>
 </template>
 <script>
@@ -14,10 +14,15 @@ export default {
   components: { SideMenu, MenuContent },
   data () {
     return {
+      catalogInfo: 'component'
     }
   },
-  mounted () { },
-  methods: { }
+  mounted () {},
+  methods: {
+    getPageInfo (type) {
+      this.catalogInfo = type
+    }
+  }
 }
 </script>
 
diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue
index 00d38511..ccae3e60 100644
--- a/data-room-ui/packages/BizComponent/index.vue
+++ b/data-room-ui/packages/BizComponent/index.vue
@@ -135,6 +135,12 @@ export default {
     BizComponentPreview
   },
   props: {},
+  beforeRouteLeave (to, from, next) {
+  // 在离开当前页面之前执行逻辑
+    const data = { componentsManagementType: 'bizComponent' }
+    this.$router.app.$options.globalData = data // 将数据存储在全局变量中
+    next() // 继续导航
+  },
   data () {
     return {
       form: {
@@ -231,10 +237,7 @@ export default {
     },
     backManagement () {
       this.$router.push({
-        path: window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components',
-        query: {
-          type: 'bizComponent'
-        }
+        path: window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components'
       })
     },
     save () {
diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue
index 6dda86c6..35413b21 100644
--- a/data-room-ui/packages/ComponentList/index.vue
+++ b/data-room-ui/packages/ComponentList/index.vue
@@ -153,7 +153,6 @@
           </div>
         </div>
       </div>
-
       <div
         v-if="catalogInfo !== 'system'"
         class="footer-pagination-wrap"
@@ -203,12 +202,16 @@ import innerRemoteComponents, { getRemoteComponents } from 'packages/RemoteCompo
 export default {
   name: 'BigScreenList',
   mixins: [pageMixins],
-  props: { },
+  props: {
+    catalogInfo: {
+      type: String,
+      default: ''
+    }
+  },
   components: { EditForm, CatalogEditForm },
   data () {
     return {
       name: '',
-      catalogInfo: 'component',
       catalogVisible: false,
       templateLoading: false,
       searchKey: '',
@@ -235,8 +238,7 @@ export default {
     }
   },
   watch: {
-    $route (val) {
-      this.catalogInfo = val.query.type || 'component'
+    catalogInfo () {
       this.reset()
       this.init()
     },
@@ -245,7 +247,6 @@ export default {
     }
   },
   mounted () {
-    this.catalogInfo = this.$route.query.type || 'component'
     this.init()
   },
   methods: {
diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
index 0c347f61..d12388e1 100644
--- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue
@@ -1071,13 +1071,11 @@ export default {
           customClass: 'bs-el-message-box'
         }).then(() => {
           this.saveFun(formName)
-
         }).catch(() => {
 
         })
       } else {
         this.saveFun(formName)
-
       }
     },
     /**
@@ -1470,6 +1468,9 @@ export default {
 }
 
 .bs-pagination {
+  position: relative !important;
+  bottom: 0 !important;
+  padding: 0 12px 16px 16px !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border: none;
diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
index ba237fb7..4739e92e 100644
--- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
+++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue
@@ -1081,10 +1081,8 @@ export default {
 }
 
 /deep/ .bs-table-box.is-Edit .el-table {
-  max-height: calc(100vh - 532px) !important;
-
   .el-table__body-wrapper {
-    max-height: calc(100vh - 568px) !important;
+    max-height: unset !important;
   }
 }
 
@@ -1114,6 +1112,9 @@ export default {
 }
 
 .bs-pagination {
+  position: relative !important;
+  bottom: 0 !important;
+  padding: 0 12px 16px 16px !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border: none;
diff --git a/data-room-ui/packages/DataSetManagement/src/index.vue b/data-room-ui/packages/DataSetManagement/src/index.vue
index 113c4d80..db566f7f 100644
--- a/data-room-ui/packages/DataSetManagement/src/index.vue
+++ b/data-room-ui/packages/DataSetManagement/src/index.vue
@@ -608,6 +608,9 @@ export default {
   padding-left: 16px !important;
 }
 .bs-pagination {
+  position: relative !important;
+  bottom: 0 !important;
+  padding: 0 12px 16px 16px !important;
   ::v-deep .el-input__inner {
     width: 110px !important;
     border:none;
diff --git a/data-room-ui/packages/DataSourceManagement/src/index.vue b/data-room-ui/packages/DataSourceManagement/src/index.vue
index 13073932..a21bda7b 100644
--- a/data-room-ui/packages/DataSourceManagement/src/index.vue
+++ b/data-room-ui/packages/DataSourceManagement/src/index.vue
@@ -146,6 +146,22 @@ export default {
   components: {
     setDatasource
   },
+  // 路由守卫-离开页面
+  beforeRouteLeave (to, from, next) {
+    const layoutEl = document.querySelector('.big-screen-router-view-wrap')
+    if (layoutEl) {
+      layoutEl.style.paddingLeft = '0'
+    }
+    next()
+  },
+  // 路由进入页面
+  beforeRouteEnter (to, from, next) {
+    const layoutEl = document.querySelector('.big-screen-router-view-wrap')
+    if (layoutEl) {
+      layoutEl.style.paddingLeft = '16px'
+    }
+    next()
+  },
   mixins: [pageMixins],
   props: {
     isDialog: {
@@ -176,11 +192,12 @@ export default {
       curRow: null
     }
   },
+  created () { },
   mounted () {
     this.init()
     const layoutEl = document.querySelector('.big-screen-router-view-wrap')
     if (layoutEl) {
-      layoutEl.style.padding = '16px'
+      layoutEl.style.paddingLeft = '16px'
     }
   },
   methods: {
diff --git a/data-room-ui/public/config/index-development.js b/data-room-ui/public/config/index-development.js
index 87f4c10c..67c95da5 100644
--- a/data-room-ui/public/config/index-development.js
+++ b/data-room-ui/public/config/index-development.js
@@ -1,6 +1,6 @@
 window.ENV = 'development'
 var developmentConfig = {
-  baseUrl: 'http://127.0.0.1:8081/bigScreenServer'
+  baseUrl: 'http://gcpaas.gccloud.com/bigScreenServer'
 }
 // 必须的
 window.CONFIG = configDeepMerge(window.CONFIG, developmentConfig)